diff --git a/CHANGES b/CHANGES
index 7841170..c313476 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,11 @@
 				CHANGES
 				=======
 
-version 8.2.2 ():
+version 8.2.2 (May 28, 2018):
 	- fixes for OpenSSL 1.1+ - patch by Eneas U de Queiroz
 	  <cote2004-github@yahoo.com>
 	- adjustments to documentation after move to github
+	- removal of old RCS/CVS tags since we have git
 
 version 8.2.1 (Jun 2, 2015):
 	- added TCP keepalives between client and server - TCP-based consoles
@@ -963,7 +964,3 @@ version 6.05:
 before version 6.05:
 	- Many, many variations.  Nothing was tracked well.  Bug fixes
 	  and enhancements of various types were applied.
-
-#
-#  $Id: CHANGES,v 1.251 2015/06/02 17:33:29 bryan Exp $
-#
diff --git a/FAQ b/FAQ
index 59100bf..836337c 100644
--- a/FAQ
+++ b/FAQ
@@ -184,7 +184,3 @@ directed to faq@conserver.com.  The FAQ answers the following questions:
     - Have you tried a search on the conserver site (it searches
       mailing list traffic as well) to see if someone else has gone
       through the same problem?
-
-#
-#  $Id: FAQ,v 1.9 2003/08/23 19:27:10 bryan Exp $
-#
diff --git a/INSTALL b/INSTALL
index bd293c2..f1ed457 100644
--- a/INSTALL
+++ b/INSTALL
@@ -286,8 +286,3 @@ Other Information And Gotchas
         connecting to servers, you might be tickling this bug and you
         can upgrade the compiler, turn off the optimization, or apply
         this code change.
-
-
-#
-#  $Id: INSTALL,v 1.41 2014/04/20 06:45:07 bryan Exp $
-#
diff --git a/PROTOCOL b/PROTOCOL
index cf9297e..bb393fa 100644
--- a/PROTOCOL
+++ b/PROTOCOL
@@ -300,7 +300,3 @@ The more "interesting" escape sequences are the following.
 	    " -- attached (nologging)]"
 	    " -- attached]"
 	    " -- spy mode]"
-
-#
-#  $Id: PROTOCOL,v 1.2 2005/09/05 21:54:03 bryan Exp $
-#
diff --git a/TODO b/TODO
index 2c5d494..5df74ff 100644
--- a/TODO
+++ b/TODO
@@ -106,7 +106,3 @@ Bryan Stansell
 
 - quick-recheck of down consoles (for uds) and possibly only log state
   changes (instead of each try) : DJ Gregor <dj@gregor.com>
-
-#
-#  $Id: TODO,v 1.56 2006/04/03 22:20:34 bryan Exp $
-#
diff --git a/autologin/INSTALL.old b/autologin/INSTALL.old
index f6cec52..f036953 100644
--- a/autologin/INSTALL.old
+++ b/autologin/INSTALL.old
@@ -1,5 +1,3 @@
-# $Id: INSTALL.old,v 1.1 2003/11/04 02:36:24 bryan Exp $
-
 To install this program you need root access and access to the physical
 console of the machine (either through the console server or via the physical
 world).
diff --git a/autologin/README b/autologin/README
index 3a5a3d9..8e8186b 100644
--- a/autologin/README
+++ b/autologin/README
@@ -15,7 +15,3 @@ No one I've ever talked to found a need for something like autologin.
 Good luck.
 
 Bryan Stansell
-
-#
-#  $Id: README,v 1.2 2002/09/23 21:08:42 bryan Exp $
-#
diff --git a/autologin/README.old b/autologin/README.old
index 21c9f65..c3905d6 100644
--- a/autologin/README.old
+++ b/autologin/README.old
@@ -1,5 +1,3 @@
-# $Id: README.old,v 1.1 2003/11/04 02:36:24 bryan Exp $
-
 This program can be used to put a root shell on the console at boot time.
 See the manual page.
 
diff --git a/autologin/autologin.c b/autologin/autologin.c
index 70ec43e..fcc2a7d 100644
--- a/autologin/autologin.c
+++ b/autologin/autologin.c
@@ -68,9 +68,6 @@
  * Global variables
  */
 
-#ifndef	lint
-char *rcsid = "$Id: autologin.c,v 1.28 2014/04/20 06:45:07 bryan Exp $";
-#endif /* not lint */
 extern char *progname;
 gid_t awGrps[NGROUPS_MAX];
 int iGrps = 0;
diff --git a/autologin/autologin.m b/autologin/autologin.m
index d150773..5453ae2 100644
--- a/autologin/autologin.m
+++ b/autologin/autologin.m
@@ -1,7 +1,5 @@
 # mkcmd parser for autologin program
 %%
-static char *rcsid =
-	"$Id: autologin.m,v 1.1 2003/11/04 02:36:24 bryan Exp $";
 %%
 
 integer variable "iErrs" {
diff --git a/autologin/autologin.man b/autologin/autologin.man
index e07a653..3c5add7 100644
--- a/autologin/autologin.man
+++ b/autologin/autologin.man
@@ -1,4 +1,3 @@
-.\" $Id: autologin.man,v 1.2 2004/03/23 18:32:06 bryan Exp $
 .TH AUTOLOGIN 8L PUCC
 .SH NAME
 autologin \- create an automatic login session from /etc/inittab
diff --git a/autologin/main.c b/autologin/main.c
index 302bdbe..dab3fef 100644
--- a/autologin/main.c
+++ b/autologin/main.c
@@ -81,8 +81,7 @@ getopt(int nargc, char **nargv, char *ostr)
 #endif /* ! HAVE_GETOPT */
 
 char
- *progname =
-    "$Id: main.c,v 1.3 2014/04/20 06:45:07 bryan Exp $", *au_terse[] = {
+ *progname = "", *au_terse[] = {
     " [-u] [-c cmd] [-e env=value] [-g group] [-l login] [-t tty]",
     " -h",
     " -V",
@@ -105,8 +104,6 @@ int
 # define u_terse	(au_terse[0])
 #endif
 
-static char *rcsid = "$Id: main.c,v 1.3 2014/04/20 06:45:07 bryan Exp $";
-
 /*
  * parser
  */
@@ -174,7 +171,7 @@ main(int argc, char **argv)
 		fMakeUtmp = 0;
 		continue;
 	    case 'V':
-		printf("%s: %s\n", progname, rcsid);
+		printf("%s\n", progname);
 		exit(0);
 	}
 	break;
diff --git a/conserver.cf/INSTALL b/conserver.cf/INSTALL
index 23d5073..4e8b2b5 100644
--- a/conserver.cf/INSTALL
+++ b/conserver.cf/INSTALL
@@ -5,7 +5,3 @@ then modify extensively.  The man page for conserver.cf and conserver.passwd
 should explain the files with enough detail to get you going.
 
 That's about it.  Good luck.
-
-#
-#  $Id: INSTALL,v 1.4 2005/05/21 13:47:18 bryan Exp $
-#
diff --git a/conserver.cf/conserver.cf.man b/conserver.cf/conserver.cf.man
index 676a6cf..ef34b96 100644
--- a/conserver.cf/conserver.cf.man
+++ b/conserver.cf/conserver.cf.man
@@ -1,4 +1,3 @@
-.\" $Id: conserver.cf.man,v 1.86 2015/06/02 17:19:31 bryan Exp $
 .TH CONSERVER.CF 5 "2015/06/02" "conserver-8.2.1" "conserver"
 .SH NAME
 conserver.cf \- console configuration file for
diff --git a/conserver.cf/conserver.passwd.man b/conserver.cf/conserver.passwd.man
index 998e3f5..d84ce79 100644
--- a/conserver.cf/conserver.passwd.man
+++ b/conserver.cf/conserver.passwd.man
@@ -1,4 +1,3 @@
-.\" $Id: conserver.passwd.man,v 1.10 2004/01/08 16:12:33 bryan Exp $
 .TH CONSERVER.PASSWD 5 "2004/01/08" "conserver-8.2.1" "conserver"
 .SH NAME
 conserver.passwd \- user access information for
diff --git a/conserver.cf/label.ps b/conserver.cf/label.ps
index ebe3e45..89afc39 100644
--- a/conserver.cf/label.ps
+++ b/conserver.cf/label.ps
@@ -1,5 +1,4 @@
 %!PS-Adobe-2.0 EPSF-1.2
-%%$Id: label.ps,v 1.1 2003/11/04 02:36:26 bryan Exp $
 %%Title: RJ-11
 %%Creator: A Braunsdorf
 %%CreationDate: 
diff --git a/conserver.cf/test.cf b/conserver.cf/test.cf
index 56ba596..e4abd61 100644
--- a/conserver.cf/test.cf
+++ b/conserver.cf/test.cf
@@ -1,7 +1,5 @@
 # dummy conserver config file
 #
-# $Id: test.cf,v 1.2 2003/07/04 18:04:05 bryan Exp $
-#
 default full {
 	rw *;
 }
diff --git a/conserver/Sun-serial b/conserver/Sun-serial
index e85af6a..31fb550 100644
--- a/conserver/Sun-serial
+++ b/conserver/Sun-serial
@@ -1,5 +1,3 @@
-# $Id: Sun-serial,v 1.1 2003/11/04 02:36:25 bryan Exp $
-
 If you are going to be hooking Sun consoles to your console server, you
 will run into a problem:  The sun will halt whenever the cable is unplugged.
 It will also halt when the the console server is powered off and on.  To
diff --git a/conserver/access.c b/conserver/access.c
index 2165957..7d411c2 100644
--- a/conserver/access.c
+++ b/conserver/access.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: access.c,v 5.74 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/access.h b/conserver/access.h
index 9bb46ec..aaf1763 100644
--- a/conserver/access.h
+++ b/conserver/access.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: access.h,v 5.27 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/client.c b/conserver/client.c
index 386189a..906a415 100644
--- a/conserver/client.c
+++ b/conserver/client.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: client.c,v 5.98 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/client.h b/conserver/client.h
index 551a3e5..66f4e65 100644
--- a/conserver/client.h
+++ b/conserver/client.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: client.h,v 5.45 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/consent.c b/conserver/consent.c
index 4a986ea..fc0d045 100644
--- a/conserver/consent.c
+++ b/conserver/consent.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: consent.c,v 5.155 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/consent.h b/conserver/consent.h
index 32ce92e..d6bce83 100644
--- a/conserver/consent.h
+++ b/conserver/consent.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: consent.h,v 5.76 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/conserver.man b/conserver/conserver.man
index e674fff..cd9c534 100644
--- a/conserver/conserver.man
+++ b/conserver/conserver.man
@@ -1,5 +1,3 @@
-.\" @(#)conserver.8 01/06/91 OSU CIS; Thomas A. Fine
-.\" $Id: conserver.man,v 1.54 2006/12/31 02:02:48 bryan Exp $
 .TH CONSERVER 8 "2006/12/31" "conserver-8.2.1" "conserver"
 .SH NAME
 conserver \- console server daemon
diff --git a/conserver/convert.c b/conserver/convert.c
index 10dd6ef..c9cf154 100644
--- a/conserver/convert.c
+++ b/conserver/convert.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: convert.c,v 1.14 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/cutil.c b/conserver/cutil.c
index 21c6f58..af8196c 100644
--- a/conserver/cutil.c
+++ b/conserver/cutil.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: cutil.c,v 1.143 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/cutil.h b/conserver/cutil.h
index c12c012..899da7a 100644
--- a/conserver/cutil.h
+++ b/conserver/cutil.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: cutil.h,v 1.70 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/fallback.c b/conserver/fallback.c
index 406e39f..f2b462b 100644
--- a/conserver/fallback.c
+++ b/conserver/fallback.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: fallback.c,v 5.62 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/group.c b/conserver/group.c
index d33585e..b89897c 100644
--- a/conserver/group.c
+++ b/conserver/group.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: group.c,v 5.352 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/group.h b/conserver/group.h
index 78267ae..eb488ab 100644
--- a/conserver/group.h
+++ b/conserver/group.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: group.h,v 5.52 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/main.c b/conserver/main.c
index b24f953..282e7be 100644
--- a/conserver/main.c
+++ b/conserver/main.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: main.c,v 5.213 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/main.h b/conserver/main.h
index c6bc39d..ae1bb2c 100644
--- a/conserver/main.h
+++ b/conserver/main.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: main.h,v 5.55 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
@@ -36,7 +34,6 @@
 
 /* program options and stuff
  */
-extern char rcsid[];
 extern int fAll, fNoinit, fInteractive, fStrip, fDaemon, fReopen,
     fNoautoreup, fSyntaxOnly;
 #if USE_IPV6
diff --git a/conserver/master.c b/conserver/master.c
index f012034..97ed6fc 100644
--- a/conserver/master.c
+++ b/conserver/master.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: master.c,v 5.141 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/master.h b/conserver/master.h
index 041140f..c06c632 100644
--- a/conserver/master.h
+++ b/conserver/master.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: master.h,v 5.18 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/readcfg.c b/conserver/readcfg.c
index 5f1fa23..949b9bf 100644
--- a/conserver/readcfg.c
+++ b/conserver/readcfg.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: readcfg.c,v 5.207 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/readcfg.h b/conserver/readcfg.h
index 3943b63..c59ff25 100644
--- a/conserver/readcfg.h
+++ b/conserver/readcfg.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: readcfg.h,v 5.51 2015/06/02 17:19:31 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/conserver/version.h b/conserver/version.h
index 5fe8552..5f47c55 100644
--- a/conserver/version.h
+++ b/conserver/version.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: version.h,v 1.82 2015/06/01 15:36:59 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/console/console.c b/console/console.c
index a312cf1..e900c2e 100644
--- a/console/console.c
+++ b/console/console.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: console.c,v 5.191 2015/06/01 15:36:59 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/console/console.man b/console/console.man
index 0948b52..1578e2a 100644
--- a/console/console.man
+++ b/console/console.man
@@ -1,4 +1,3 @@
-.\" $Id: console.man,v 1.66 2015/06/02 17:19:31 bryan Exp $
 .TH CONSOLE 1 "2015/06/02" "conserver-8.2.1" "conserver"
 .SH NAME
 console \- console server client program
diff --git a/console/getpassword.c b/console/getpassword.c
index e54e4f0..6ba152f 100644
--- a/console/getpassword.c
+++ b/console/getpassword.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: getpassword.c,v 1.9 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/console/getpassword.h b/console/getpassword.h
index e08773f..5aca890 100644
--- a/console/getpassword.h
+++ b/console/getpassword.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: getpassword.h,v 1.4 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/console/readconf.c b/console/readconf.c
index e83f203..0c29549 100644
--- a/console/readconf.c
+++ b/console/readconf.c
@@ -1,6 +1,4 @@
 /*
- *  $Id: readconf.c,v 5.8 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/console/readconf.h b/console/readconf.h
index ddc4d9b..1e9d65d 100644
--- a/console/readconf.h
+++ b/console/readconf.h
@@ -1,6 +1,4 @@
 /*
- *  $Id: readconf.h,v 5.7 2014/04/20 06:45:07 bryan Exp $
- *
  *  Copyright conserver.com, 2000
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@conserver.com)
diff --git a/contrib/README b/contrib/README
index 867997e..fe77195 100644
--- a/contrib/README
+++ b/contrib/README
@@ -22,7 +22,3 @@ I can't verify that these scripts will work for everyone.  Hopefully they
 will be helpful.
 
 Bryan Stansell
-
-#
-#  $Id: README,v 1.4 2003/09/29 14:29:37 bryan Exp $
-#