diff --git a/libtelnet/auth.c b/libtelnet/auth.c
index 709709e..5cddb63 100644
--- a/libtelnet/auth.c
+++ b/libtelnet/auth.c
@@ -38,7 +38,7 @@ static const char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 
 /*
diff --git a/libtelnet/enc_des.c b/libtelnet/enc_des.c
index d99e330..126c3e0 100644
--- a/libtelnet/enc_des.c
+++ b/libtelnet/enc_des.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #ifdef	ENCRYPTION
 # ifdef	AUTHENTICATION
diff --git a/libtelnet/encrypt.c b/libtelnet/encrypt.c
index df22b1c..0635d3f 100644
--- a/libtelnet/encrypt.c
+++ b/libtelnet/encrypt.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 #if 0
diff --git a/libtelnet/genget.c b/libtelnet/genget.c
index e24bb44..c32b94c 100644
--- a/libtelnet/genget.c
+++ b/libtelnet/genget.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 #if 0
diff --git a/libtelnet/getent.c b/libtelnet/getent.c
index d6e8d9c..8b0b391 100644
--- a/libtelnet/getent.c
+++ b/libtelnet/getent.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 #if 0
diff --git a/libtelnet/kerberos.c b/libtelnet/kerberos.c
index b3e3ee2..29ccb43 100644
--- a/libtelnet/kerberos.c
+++ b/libtelnet/kerberos.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 static const char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
diff --git a/libtelnet/kerberos5.c b/libtelnet/kerberos5.c
index a61398e..d1ff80d 100644
--- a/libtelnet/kerberos5.c
+++ b/libtelnet/kerberos5.c
@@ -53,7 +53,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifdef	KRB5
 
diff --git a/libtelnet/krb4encpwd.c b/libtelnet/krb4encpwd.c
index 3e0b752..b267fc5 100644
--- a/libtelnet/krb4encpwd.c
+++ b/libtelnet/krb4encpwd.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
diff --git a/libtelnet/misc.c b/libtelnet/misc.c
index 97299ad..12ae9e6 100644
--- a/libtelnet/misc.c
+++ b/libtelnet/misc.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 #if 0
diff --git a/libtelnet/pk.c b/libtelnet/pk.c
index 05b74f4..9b406cd 100644
--- a/libtelnet/pk.c
+++ b/libtelnet/pk.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 /* public key routines */
 /* functions:
diff --git a/libtelnet/read_password.c b/libtelnet/read_password.c
index badf214..368f821 100644
--- a/libtelnet/read_password.c
+++ b/libtelnet/read_password.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 #if 0
diff --git a/libtelnet/rsaencpwd.c b/libtelnet/rsaencpwd.c
index 071d19d..27efc10 100644
--- a/libtelnet/rsaencpwd.c
+++ b/libtelnet/rsaencpwd.c
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifndef lint
 static char sccsid[] = "@(#)rsaencpwd.c	8.3 (Berkeley) 5/30/95";
diff --git a/libtelnet/sra.c b/libtelnet/sra.c
index 3b0541d..636ddff 100644
--- a/libtelnet/sra.c
+++ b/libtelnet/sra.c
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 
-__FBSDID("$FreeBSD$");
+
 
 #ifdef	SRA
 #ifdef	ENCRYPTION
diff --git a/telnet/authenc.c b/telnet/authenc.c
index 56159a9..d8a7fea 100644
--- a/telnet/authenc.c
+++ b/telnet/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/telnet/commands.c b/telnet/commands.c
index 00954e8..bd353be 100644
--- a/telnet/commands.c
+++ b/telnet/commands.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include <sys/param.h>
 #include <sys/un.h>
diff --git a/telnet/main.c b/telnet/main.c
index 219257a..9a324ed 100644
--- a/telnet/main.c
+++ b/telnet/main.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include <sys/param.h>
 #include <sys/socket.h>
diff --git a/telnet/network.c b/telnet/network.c
index f6300ab..d15dec7 100644
--- a/telnet/network.c
+++ b/telnet/network.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/telnet/ring.c b/telnet/ring.c
index 6c2b7ef..2ea7260 100644
--- a/telnet/ring.c
+++ b/telnet/ring.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 /*
  * This defines a structure for a ring buffer.
diff --git a/telnet/sys_bsd.c b/telnet/sys_bsd.c
index 7a40156..eaeabd0 100644
--- a/telnet/sys_bsd.c
+++ b/telnet/sys_bsd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 /*
  * The following routines try to encapsulate what is system dependent
diff --git a/telnet/telnet.c b/telnet/telnet.c
index d611732..4584997 100644
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include <sys/types.h>
 
diff --git a/telnet/terminal.c b/telnet/terminal.c
index fd67025..14e9d97 100644
--- a/telnet/terminal.c
+++ b/telnet/terminal.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include "arpa/telnet.h"
 #include <sys/types.h>
diff --git a/telnet/utilities.c b/telnet/utilities.c
index 47bd614..3727517 100644
--- a/telnet/utilities.c
+++ b/telnet/utilities.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #define	TELOPTS
 #define	TELCMDS
diff --git a/telnetd/authenc.c b/telnetd/authenc.c
index 6ec764b..b3706cc 100644
--- a/telnetd/authenc.c
+++ b/telnetd/authenc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)authenc.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #ifdef	AUTHENTICATION
 #ifdef	ENCRYPTION
diff --git a/telnetd/global.c b/telnetd/global.c
index 2ed82d0..395af61 100644
--- a/telnetd/global.c
+++ b/telnetd/global.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 /*
  * Allocate global variables.  We do this
diff --git a/telnetd/slc.c b/telnetd/slc.c
index ad03441..639276e 100644
--- a/telnetd/slc.c
+++ b/telnetd/slc.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)slc.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include "telnetd.h"
 
diff --git a/telnetd/state.c b/telnetd/state.c
index 71e6f00..998b500 100644
--- a/telnetd/state.c
+++ b/telnetd/state.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include <stdarg.h>
 #include "telnetd.h"
diff --git a/telnetd/sys_term.c b/telnetd/sys_term.c
index 7e8b8dc..0c6010a 100644
--- a/telnetd/sys_term.c
+++ b/telnetd/sys_term.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)sys_term.c	8.4+1 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include <sys/types.h>
 #include <sys/tty.h>
diff --git a/telnetd/telnetd.c b/telnetd/telnetd.c
index 1f40e06..2948e9e 100644
--- a/telnetd/telnetd.c
+++ b/telnetd/telnetd.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)telnetd.c	8.4 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include "telnetd.h"
 #include "pathnames.h"
diff --git a/telnetd/termstat.c b/telnetd/termstat.c
index af4e138..1360bbd 100644
--- a/telnetd/termstat.c
+++ b/telnetd/termstat.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
 #endif
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #include "telnetd.h"
 
diff --git a/telnetd/utility.c b/telnetd/utility.c
index eaed5e9..ae5f280 100644
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -37,7 +37,7 @@ static const char sccsid[] = "@(#)utility.c	8.4 (Berkeley) 5/30/95";
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+
 
 #ifdef __FreeBSD__
 #include <locale.h>