diff --git a/arpa/telnet.h b/arpa/telnet.h
index 8a17ff1..d794267 100644
--- a/arpa/telnet.h
+++ b/arpa/telnet.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
+ * $FreeBSD$
  */
 
 #ifndef _ARPA_TELNET_H_
diff --git a/libtelnet/auth-proto.h b/libtelnet/auth-proto.h
index c62fe5f..e6b8481 100644
--- a/libtelnet/auth-proto.h
+++ b/libtelnet/auth-proto.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)auth-proto.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 /*
diff --git a/libtelnet/enc-proto.h b/libtelnet/enc-proto.h
index 8cec406..bbbc07c 100644
--- a/libtelnet/enc-proto.h
+++ b/libtelnet/enc-proto.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)enc-proto.h	8.1 (Berkeley) 6/4/93
+ * $FreeBSD$
  */
 
 /*
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index e1ac1c4..bb3a43c 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)encrypt.c	8.2 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index 8668db4..9f56ab0 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)genget.c	8.2 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index 5aa1049..7d43a8e 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)getent.c	8.2 (Berkeley) 12/15/93";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 static char *area;
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 4f8f8d5..c486418 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/4/93";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/libtelnet/pk.h b/libtelnet/pk.h
index b41bba5..6a84ac5 100644
--- a/libtelnet/pk.h
+++ b/libtelnet/pk.h
@@ -1,4 +1,5 @@
 /* header for the des routines that we will use */
+/* $FreeBSD$ */
 
 typedef unsigned char byte, DesData[ 8], IdeaData[16];
 #if 0
diff --git a/libtelnet/spx.c b/libtelnet/spx.c
index 90c37a4..75d6e3e 100644
--- a/libtelnet/spx.c
+++ b/libtelnet/spx.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)spx.c	8.2 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #ifdef	SPX
diff --git a/libtelnet/sra.c b/libtelnet/sra.c
index 44a26f2..95ac9fd 100644
--- a/libtelnet/sra.c
+++ b/libtelnet/sra.c
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #ifdef	SRA
 #include <sys/types.h>
 #include <arpa/telnet.h>
diff --git a/telnet/authenc.c b/telnet/authenc.c
index f829b1a..47b242f 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #if	defined(AUTHENTICATION) || defined(ENCRYPTION)
diff --git a/telnet/network.c b/telnet/network.c
index 9964bc2..17fff47 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/telnet/ring.c b/telnet/ring.c
index 13fe6c2..268a418 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index ed5f459..aac7c6a 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 /*
diff --git a/telnet/telnet.c b/telnet/telnet.c
index 1f9c383..63fb9d7 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/telnet/terminal.c b/telnet/terminal.c
index a2383d9..2069396 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <arpa/telnet.h>
diff --git a/telnet/tn3270.c b/telnet/tn3270.c
index 5a453d9..92219b7 100644
--- a/telnet/tn3270.c
+++ b/telnet/tn3270.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)tn3270.c	8.2 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 0ee882e..fd9f5c9 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -32,7 +32,12 @@
  */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
+#else
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 #define	TELOPTS
diff --git a/telnetd/ext.h b/telnetd/ext.h
index f60139e..b84cee4 100644
--- a/telnetd/ext.h
+++ b/telnetd/ext.h
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ext.h	8.2 (Berkeley) 12/15/93
+ * $FreeBSD$
  */
 
 /*