diff --git a/appl/telnet/libtelnet/auth.c b/appl/telnet/libtelnet/auth.c
index bfab8935a..85d622f7d 100644
--- a/appl/telnet/libtelnet/auth.c
+++ b/appl/telnet/libtelnet/auth.c
@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 /*
  * Copyright (C) 1990 by the Massachusetts Institute of Technology
  *
@@ -57,6 +53,8 @@ static char sccsid[] = "@(#)auth.c	8.3 (Berkeley) 5/30/95";
 
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(AUTHENTICATION)
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/appl/telnet/libtelnet/enc_des.c b/appl/telnet/libtelnet/enc_des.c
index 9dc31a7de..50f6f6815 100644
--- a/appl/telnet/libtelnet/enc_des.c
+++ b/appl/telnet/libtelnet/enc_des.c
@@ -31,16 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)enc_des.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#ifndef lint
-static char orig_sccsid[] = "@(#)enc_des.c	5.1 (Berkeley) 3/22/91";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(AUTHENTICATION) && defined(ENCRYPTION) && defined(DES_ENCRYPTION)
 #include <arpa/telnet.h>
 #include <stdio.h>
diff --git a/appl/telnet/libtelnet/encrypt.c b/appl/telnet/libtelnet/encrypt.c
index b27474588..d37e94d1c 100644
--- a/appl/telnet/libtelnet/encrypt.c
+++ b/appl/telnet/libtelnet/encrypt.c
@@ -31,14 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)encrypt.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
-#ifndef lint
-static char orig_sccsid[] = "@(#)encrypt.c	5.2 (Berkeley) 3/22/91";
-#endif /* not lint */
-
 /*
  * Copyright (C) 1990 by the Massachusetts Institute of Technology
  *
@@ -62,6 +54,8 @@ static char orig_sccsid[] = "@(#)encrypt.c	5.2 (Berkeley) 3/22/91";
 
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(ENCRYPTION)
 
 #define	ENCRYPT_NAMES
diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c
index 3949c0354..58597db27 100644
--- a/appl/telnet/libtelnet/kerberos.c
+++ b/appl/telnet/libtelnet/kerberos.c
@@ -31,10 +31,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 /*
  * Copyright (C) 1990 by the Massachusetts Institute of Technology
  *
@@ -57,6 +53,8 @@ static char sccsid[] = "@(#)kerberos.c	8.3 (Berkeley) 5/30/95";
 
 #include <config.h>
 
+RCSID("$Id$");
+
 #ifdef	KRB4
 #include <sys/types.h>
 #include <arpa/telnet.h>
diff --git a/appl/telnet/libtelnet/kerberos5.c b/appl/telnet/libtelnet/kerberos5.c
index 54fc69876..9b32ac0b6 100644
--- a/appl/telnet/libtelnet/kerberos5.c
+++ b/appl/telnet/libtelnet/kerberos5.c
@@ -45,10 +45,6 @@ char rcsid_kerberos5_c[] = "$Id$";
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)kerberos5.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 /*
  * Copyright (C) 1990 by the Massachusetts Institute of Technology
  *
@@ -71,6 +67,8 @@ static char sccsid[] = "@(#)kerberos5.c	8.3 (Berkeley) 5/30/95";
 
 #include <config.h>
 
+RCSID("$Id$");
+
 #ifdef	KRB5
 #include <arpa/telnet.h>
 #include <stdio.h>
diff --git a/appl/telnet/libtelnet/krb4encpwd.c b/appl/telnet/libtelnet/krb4encpwd.c
index 668619f4a..90e764d56 100644
--- a/appl/telnet/libtelnet/krb4encpwd.c
+++ b/appl/telnet/libtelnet/krb4encpwd.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)krb4encpwd.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #ifdef	KRB4_ENCPWD
 /*
  * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION
diff --git a/appl/telnet/libtelnet/misc.c b/appl/telnet/libtelnet/misc.c
index e54b64c30..ac3d64c62 100644
--- a/appl/telnet/libtelnet/misc.c
+++ b/appl/telnet/libtelnet/misc.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include "misc.h"
 
 char *RemoteHostName;
diff --git a/appl/telnet/libtelnet/read_password.c b/appl/telnet/libtelnet/read_password.c
index f3679e317..2330b862d 100644
--- a/appl/telnet/libtelnet/read_password.c
+++ b/appl/telnet/libtelnet/read_password.c
@@ -31,13 +31,7 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)read_password.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 /*
- * $Source$
- * $Author$
  *
  * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute
  * of Technology.
@@ -52,6 +46,8 @@ static char sccsid[] = "@(#)read_password.c	8.3 (Berkeley) 5/30/95";
 
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(RSA_ENCPWD) || defined(KRB4_ENCPWD)
 
 #include <stdio.h>
diff --git a/appl/telnet/libtelnet/rsaencpwd.c b/appl/telnet/libtelnet/rsaencpwd.c
index b6a3864bf..2e23dc37f 100644
--- a/appl/telnet/libtelnet/rsaencpwd.c
+++ b/appl/telnet/libtelnet/rsaencpwd.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)rsaencpwd.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #ifdef	RSA_ENCPWD
 /*
  * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION
diff --git a/appl/telnet/libtelnet/spx.c b/appl/telnet/libtelnet/spx.c
index adfcf2e6c..e866670c7 100644
--- a/appl/telnet/libtelnet/spx.c
+++ b/appl/telnet/libtelnet/spx.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)spx.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #ifdef	SPX
 /*
  * COPYRIGHT (C) 1990 DIGITAL EQUIPMENT CORPORATION
diff --git a/appl/telnet/telnet/authenc.c b/appl/telnet/telnet/authenc.c
index 1f4efbf5b..98133bfb4 100644
--- a/appl/telnet/telnet/authenc.c
+++ b/appl/telnet/telnet/authenc.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)authenc.c	8.1 (Berkeley) 6/6/93";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(AUTHENTICATION) || defined(ENCRYPTION)
 #include <sys/types.h>
 #include <arpa/telnet.h>
diff --git a/appl/telnet/telnet/commands.c b/appl/telnet/telnet/commands.c
index 7ed13b0b5..d17d4a9ae 100644
--- a/appl/telnet/telnet/commands.c
+++ b/appl/telnet/telnet/commands.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)commands.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(unix)
 #include <sys/param.h>
 #if	defined(CRAY) || defined(sysV88)
diff --git a/appl/telnet/telnet/main.c b/appl/telnet/telnet/main.c
index da36b5702..144a6d51f 100644
--- a/appl/telnet/telnet/main.c
+++ b/appl/telnet/telnet/main.c
@@ -37,12 +37,10 @@ static char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
-static char sccsid[] = "@(#)main.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include <sys/types.h>
 
 #include "ring.h"
diff --git a/appl/telnet/telnet/network.c b/appl/telnet/telnet/network.c
index 80c8aed8a..7efbd77b9 100644
--- a/appl/telnet/telnet/network.c
+++ b/appl/telnet/telnet/network.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)network.c	8.2 (Berkeley) 12/15/93";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include <sys/types.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
diff --git a/appl/telnet/telnet/ring.c b/appl/telnet/telnet/ring.c
index fe65ebc2d..0f8a14ac1 100644
--- a/appl/telnet/telnet/ring.c
+++ b/appl/telnet/telnet/ring.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)ring.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 /*
  * This defines a structure for a ring buffer.
  *
diff --git a/appl/telnet/telnet/sys_bsd.c b/appl/telnet/telnet/sys_bsd.c
index 3783ecada..0297bd0d2 100644
--- a/appl/telnet/telnet/sys_bsd.c
+++ b/appl/telnet/telnet/sys_bsd.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)sys_bsd.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 /*
  * The following routines try to encapsulate what is system dependent
  * (at least between 4.x and dos) which is used in telnet.c.
diff --git a/appl/telnet/telnet/telnet.c b/appl/telnet/telnet/telnet.c
index 0c92682d2..a070e0694 100644
--- a/appl/telnet/telnet/telnet.c
+++ b/appl/telnet/telnet/telnet.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)telnet.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include <sys/types.h>
 #include <stdlib.h>
 
diff --git a/appl/telnet/telnet/terminal.c b/appl/telnet/telnet/terminal.c
index d042c7b3b..6056207ca 100644
--- a/appl/telnet/telnet/terminal.c
+++ b/appl/telnet/telnet/terminal.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)terminal.c	8.2 (Berkeley) 2/16/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include <arpa/telnet.h>
 #include <sys/types.h>
 
diff --git a/appl/telnet/telnet/utilities.c b/appl/telnet/telnet/utilities.c
index 52b7edb75..874396174 100644
--- a/appl/telnet/telnet/utilities.c
+++ b/appl/telnet/telnet/utilities.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)utilities.c	8.3 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #define	TELOPTS
 #define	TELCMDS
 #define	SLC_NAMES
diff --git a/appl/telnet/telnetd/authenc.c b/appl/telnet/telnetd/authenc.c
index b93268c4b..b044458d2 100644
--- a/appl/telnet/telnetd/authenc.c
+++ b/appl/telnet/telnetd/authenc.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)authenc.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #if	defined(AUTHENTICATION) || defined(ENCRYPTION)
 #include "telnetd.h"
 #include <libtelnet/misc.h>
diff --git a/appl/telnet/telnetd/global.c b/appl/telnet/telnetd/global.c
index bfd70ed85..ecd84fca0 100644
--- a/appl/telnet/telnetd/global.c
+++ b/appl/telnet/telnetd/global.c
@@ -31,15 +31,13 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)global.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
 /* a *lot* of ugly global definitions that really should be removed...
  */
 
 #include <config.h>
 
+RCSID("$Id$");
+
 #include "defs.h"
 #include "ext.h"
 
diff --git a/appl/telnet/telnetd/slc.c b/appl/telnet/telnetd/slc.c
index 125a7970d..b0be95a57 100644
--- a/appl/telnet/telnetd/slc.c
+++ b/appl/telnet/telnetd/slc.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)slc.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include "telnetd.h"
 
 #ifdef	LINEMODE
diff --git a/appl/telnet/telnetd/state.c b/appl/telnet/telnetd/state.c
index a0f06ca67..768fb5a0a 100644
--- a/appl/telnet/telnetd/state.c
+++ b/appl/telnet/telnetd/state.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)state.c	8.5 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include "telnetd.h"
 #if	defined(AUTHENTICATION)
 #include <libtelnet/auth.h>
diff --git a/appl/telnet/telnetd/sys_term.c b/appl/telnet/telnetd/sys_term.c
index 3fbc8c909..082054fd7 100644
--- a/appl/telnet/telnetd/sys_term.c
+++ b/appl/telnet/telnetd/sys_term.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)sys_term.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include "telnetd.h"
 #include "pathnames.h"
 
diff --git a/appl/telnet/telnetd/termstat.c b/appl/telnet/telnetd/termstat.c
index b7c83833f..dede5e4fb 100644
--- a/appl/telnet/telnetd/termstat.c
+++ b/appl/telnet/telnetd/termstat.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)termstat.c	8.2 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #include "telnetd.h"
 
 /*
diff --git a/appl/telnet/telnetd/utility.c b/appl/telnet/telnetd/utility.c
index cd14ab3bc..0e0e2a3c5 100644
--- a/appl/telnet/telnetd/utility.c
+++ b/appl/telnet/telnetd/utility.c
@@ -31,12 +31,10 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)utility.c	8.4 (Berkeley) 5/30/95";
-#endif /* not lint */
-
 #include <config.h>
 
+RCSID("$Id$");
+
 #define PRINTOPTIONS
 #include "telnetd.h"