diff --git a/crypto/openssh/auth-krb4.c b/crypto/openssh/auth-krb4.c
index f7bd0334738..b28df469f74 100644
--- a/crypto/openssh/auth-krb4.c
+++ b/crypto/openssh/auth-krb4.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: auth-krb4.c,v 1.29 2003/02/21 10:34:48 mpech Exp $");
-RCSID("$FreeBSD$");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
index 0ad91d07daf..fe9570f92a1 100644
--- a/crypto/openssh/auth-pam.c
+++ b/crypto/openssh/auth-pam.c
@@ -39,7 +39,6 @@ extern char *__progname;
 extern int use_privsep;
 
 RCSID("$Id: auth-pam.c,v 1.55 2003/01/22 04:42:26 djm Exp $");
-RCSID("$FreeBSD$");
 
 #define NEW_AUTHTOK_MSG \
 	"Warning: Your password has expired, please change it now."
diff --git a/crypto/openssh/auth2-pam.c b/crypto/openssh/auth2-pam.c
index 114456bbcf4..ac28fb2451c 100644
--- a/crypto/openssh/auth2-pam.c
+++ b/crypto/openssh/auth2-pam.c
@@ -1,6 +1,5 @@
 #include "includes.h"
 RCSID("$Id: auth2-pam.c,v 1.15 2003/01/08 01:37:03 djm Exp $");
-RCSID("$FreeBSD$");
 
 #ifdef USE_PAM
 #include <security/pam_appl.h>
diff --git a/crypto/openssh/authfd.c b/crypto/openssh/authfd.c
index 570e2504d86..a186e01175b 100644
--- a/crypto/openssh/authfd.c
+++ b/crypto/openssh/authfd.c
@@ -36,7 +36,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: authfd.c,v 1.58 2003/01/23 13:50:27 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include <openssl/evp.h>
 
diff --git a/crypto/openssh/authfile.c b/crypto/openssh/authfile.c
index f464ea5885e..90618efdef8 100644
--- a/crypto/openssh/authfile.c
+++ b/crypto/openssh/authfile.c
@@ -37,7 +37,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: authfile.c,v 1.52 2003/03/13 11:42:18 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/crypto/openssh/canohost.c b/crypto/openssh/canohost.c
index aa8c9af76a7..941db23b64b 100644
--- a/crypto/openssh/canohost.c
+++ b/crypto/openssh/canohost.c
@@ -13,7 +13,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: canohost.c,v 1.35 2002/11/26 02:38:54 stevesk Exp $");
-RCSID("$FreeBSD$");
 
 #include "packet.h"
 #include "xmalloc.h"
diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index cc97309401b..1937b02446b 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/channels.c
@@ -40,7 +40,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: channels.c,v 1.187 2003/03/05 22:33:43 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/crypto/openssh/channels.h b/crypto/openssh/channels.h
index 9ff0fd90fc9..bd2e92589c5 100644
--- a/crypto/openssh/channels.h
+++ b/crypto/openssh/channels.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: channels.h,v 1.70 2002/06/24 14:33:27 markus Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/cipher.c b/crypto/openssh/cipher.c
index 65cca55b9b0..b5d38747ed8 100644
--- a/crypto/openssh/cipher.c
+++ b/crypto/openssh/cipher.c
@@ -36,7 +36,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: cipher.c,v 1.62 2002/11/21 22:45:31 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "xmalloc.h"
 #include "log.h"
diff --git a/crypto/openssh/compat.h b/crypto/openssh/compat.h
index eb6ef80f4d4..881e450d39e 100644
--- a/crypto/openssh/compat.h
+++ b/crypto/openssh/compat.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: compat.h,v 1.34 2003/04/01 10:31:26 markus Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/hostfile.c b/crypto/openssh/hostfile.c
index 36753d41580..dcee0344833 100644
--- a/crypto/openssh/hostfile.c
+++ b/crypto/openssh/hostfile.c
@@ -37,7 +37,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: hostfile.c,v 1.30 2002/07/24 16:11:18 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "packet.h"
 #include "match.h"
diff --git a/crypto/openssh/key.c b/crypto/openssh/key.c
index ce18feca471..060b63745a3 100644
--- a/crypto/openssh/key.c
+++ b/crypto/openssh/key.c
@@ -33,7 +33,6 @@
  */
 #include "includes.h"
 RCSID("$OpenBSD: key.c,v 1.51 2003/02/12 09:33:04 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include <openssl/evp.h>
 
diff --git a/crypto/openssh/rijndael.c b/crypto/openssh/rijndael.c
index 5786025fba1..6965ca3b0de 100644
--- a/crypto/openssh/rijndael.c
+++ b/crypto/openssh/rijndael.c
@@ -1,5 +1,4 @@
 /*	$OpenBSD: rijndael.c,v 1.14 2002/07/10 17:53:54 deraadt Exp $ */
-/*	$FreeBSD$ */
 
 /**
  * rijndael-alg-fst.c
diff --git a/crypto/openssh/scp.c b/crypto/openssh/scp.c
index 0950a984977..35d4c5f7143 100644
--- a/crypto/openssh/scp.c
+++ b/crypto/openssh/scp.c
@@ -76,7 +76,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: scp.c,v 1.102 2003/03/05 22:33:43 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "xmalloc.h"
 #include "atomicio.h"
diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c
index c2f9e0cf8d1..f4df9cccb01 100644
--- a/crypto/openssh/serverloop.c
+++ b/crypto/openssh/serverloop.c
@@ -36,7 +36,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: serverloop.c,v 1.106 2003/04/01 10:22:21 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "xmalloc.h"
 #include "packet.h"
diff --git a/crypto/openssh/session.h b/crypto/openssh/session.h
index 249e21c807f..d3ddfab75f9 100644
--- a/crypto/openssh/session.h
+++ b/crypto/openssh/session.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: session.h,v 1.19 2002/06/30 21:59:45 deraadt Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
diff --git a/crypto/openssh/ssh-add.c b/crypto/openssh/ssh-add.c
index b193807b2ea..9adec309441 100644
--- a/crypto/openssh/ssh-add.c
+++ b/crypto/openssh/ssh-add.c
@@ -36,7 +36,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: ssh-add.c,v 1.66 2003/03/05 22:33:43 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include <openssl/evp.h>
 
diff --git a/crypto/openssh/ssh-keyscan.c b/crypto/openssh/ssh-keyscan.c
index bd8fcf504d3..5b4eb82d1fc 100644
--- a/crypto/openssh/ssh-keyscan.c
+++ b/crypto/openssh/ssh-keyscan.c
@@ -8,7 +8,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: ssh-keyscan.c,v 1.41 2003/02/16 17:09:57 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "openbsd-compat/sys-queue.h"
 
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h
index 794af346440..0a6ad1317b9 100644
--- a/crypto/openssh/ssh.h
+++ b/crypto/openssh/ssh.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: ssh.h,v 1.71 2002/06/22 02:00:29 stevesk Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/sshconnect.c b/crypto/openssh/sshconnect.c
index e8d7a39b8fd..dae25969a49 100644
--- a/crypto/openssh/sshconnect.c
+++ b/crypto/openssh/sshconnect.c
@@ -14,7 +14,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: sshconnect.c,v 1.137 2002/11/21 23:03:51 deraadt Exp $");
-RCSID("$FreeBSD$");
 
 #include <openssl/bn.h>
 
diff --git a/crypto/openssh/sshconnect1.c b/crypto/openssh/sshconnect1.c
index 368b4128ab4..2fc9a981afc 100644
--- a/crypto/openssh/sshconnect1.c
+++ b/crypto/openssh/sshconnect1.c
@@ -14,7 +14,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: sshconnect1.c,v 1.52 2002/08/08 13:50:23 aaron Exp $");
-RCSID("$FreeBSD$");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
diff --git a/crypto/openssh/sshconnect2.c b/crypto/openssh/sshconnect2.c
index c1e5879b7ec..642b34b9e49 100644
--- a/crypto/openssh/sshconnect2.c
+++ b/crypto/openssh/sshconnect2.c
@@ -24,7 +24,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: sshconnect2.c,v 1.114 2003/04/01 10:22:21 markus Exp $");
-RCSID("$FreeBSD$");
 
 #include "ssh.h"
 #include "ssh2.h"
diff --git a/crypto/openssh/sshlogin.c b/crypto/openssh/sshlogin.c
index 6aeaa05ae73..12555d635fd 100644
--- a/crypto/openssh/sshlogin.c
+++ b/crypto/openssh/sshlogin.c
@@ -40,7 +40,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: sshlogin.c,v 1.5 2002/08/29 15:57:25 stevesk Exp $");
-RCSID("$FreeBSD$");
 
 #include "loginrec.h"
 
diff --git a/crypto/openssh/sshlogin.h b/crypto/openssh/sshlogin.h
index 2bf9e0d1442..1c8bfad3233 100644
--- a/crypto/openssh/sshlogin.h
+++ b/crypto/openssh/sshlogin.h
@@ -1,5 +1,4 @@
 /*	$OpenBSD: sshlogin.h,v 1.4 2002/08/29 15:57:25 stevesk Exp $	*/
-/*	$FreeBSD$	*/
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/crypto/openssh/sshpty.c b/crypto/openssh/sshpty.c
index 3f7e71a043e..d28947f620d 100644
--- a/crypto/openssh/sshpty.c
+++ b/crypto/openssh/sshpty.c
@@ -13,7 +13,6 @@
 
 #include "includes.h"
 RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $");
-RCSID("$FreeBSD$");
 
 #ifdef HAVE_UTIL_H
 # include <util.h>