diff --git a/atomicio.c b/atomicio.c
index 5b0b3934a6c8a9a2592a36a8f60ee04faa5f6f00..db2c2ba6b16318de473a6231f1954c3c7e4e3a76 100644
--- a/atomicio.c
+++ b/atomicio.c
@@ -27,7 +27,7 @@
 
 /* Taken from OpenSSH for use with the loginrec code */
 
-/* RCSID("$OpenBSD: atomicio.c,v 1.10 2001/05/08 22:48:07 markus Exp $"); */
+/* RCSID("OpenBSD: atomicio.c,v 1.10 2001/05/08 22:48:07 markus Exp "); */
 
 #include "atomicio.h"
 
diff --git a/loginrec.c b/loginrec.c
index 5ec0bc1117d08e77120afd8bd4330c1aaec016fb..7a9c480cb395c67db09a66fdb4a02ea26ff90fdd 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -150,7 +150,6 @@
  **
  **/
 
-/*RCSID("$Id: loginrec.c,v 1.2 2004/05/04 10:17:43 matt Exp $");*/
 
 #include "includes.h"
 #include "loginrec.h"
diff --git a/loginrec.h b/loginrec.h
index 3141b10cdc7b039bc424c349240e64a52ac300a7..f253fa62f31974b4291ec0dbdac7d3460946be1c 100644
--- a/loginrec.h
+++ b/loginrec.h
@@ -31,7 +31,7 @@
 
 #include "includes.h"
 
-/* RCSID("$Id: loginrec.h,v 1.2 2004/05/04 10:17:43 matt Exp $"); */
+/* RCSID("Id: loginrec.h,v 1.2 2004/05/04 10:17:43 matt Exp "); */
 
 /* The following #defines are from OpenSSH's defines.h, required for loginrec */
 
diff --git a/progressmeter.c b/progressmeter.c
index 39e8a77dc7a8a95fff9c6eea96124c45358719f9..0d856cbaf5ccba466a996cf8d723f4db97c5c78a 100644
--- a/progressmeter.c
+++ b/progressmeter.c
@@ -24,7 +24,7 @@
  */
 
 #include "includes.h"
-/*RCSID("$OpenBSD: progressmeter.c,v 1.15 2003/08/31 12:14:22 markus Exp $");*/
+/*RCSID("OpenBSD: progressmeter.c,v 1.15 2003/08/31 12:14:22 markus Exp ");*/
 
 #include "progressmeter.h"
 #include "atomicio.h"
diff --git a/scpmisc.c b/scpmisc.c
index 2d37753875a98731cfffe37a8449a2dedb4b1994..e15bf4db7df58450cf1700696d63a56345ec2576 100644
--- a/scpmisc.c
+++ b/scpmisc.c
@@ -22,7 +22,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*RCSID("$OpenBSD: misc.c,v 1.22 2003/09/18 08:49:45 markus Exp $");*/
+/*RCSID("OpenBSD: misc.c,v 1.22 2003/09/18 08:49:45 markus Exp ");*/
 
 /* For xmalloc, xfree etc:
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -38,7 +38,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/*RCSID("$OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp $");*/
+/*RCSID("OpenBSD: xmalloc.c,v 1.16 2001/07/23 18:21:46 stevesk Exp ");*/
 
 #include "includes.h"
 #include "scpmisc.h"
diff --git a/sshpty.c b/sshpty.c
index 799a92c8bdaf087e0f2f6dfb2c307f53c1ba4dd3..3526ff08c8c6b3935c188921b8b355702c609a70 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -15,7 +15,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/*RCSID("$OpenBSD: sshpty.c,v 1.7 2002/06/24 17:57:20 deraadt Exp $");*/
+/*RCSID("OpenBSD: sshpty.c,v 1.7 2002/06/24 17:57:20 deraadt Exp ");*/
 
 #include "includes.h"
 #include "dbutil.h"