diff --git a/CHANGES b/CHANGES
index fec7c35..8cd0ef3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 				CHANGES
 				=======
 
+version 6.16 (Sep 8, 2000):
+	- Changed the main GNAC references to Certainty Solutions
+	- Made the comment blocks in conserver/cons.h a little less
+	  confusing
+	- There are *NO* code changes to this version.  If you have
+	  version 6.15, you're good to go.
+
 version 6.15 (Mar 6, 2000):
 	- Added debug flag (-D) and the beginning of debug output
 	- A timeout can now be set for TCP connect() calls.  The
@@ -74,5 +81,5 @@ before version 6.05:
 	  and enhancements of various types were applied.
 
 #
-#  $Id: CHANGES,v 1.16 2000-03-06 19:50:18-08 bryan Exp $
+#  $Id: CHANGES,v 1.17 2000-09-08 16:12:37-07 bryan Exp $
 #
diff --git a/README b/README
index f48ffd6..f8b0c73 100644
--- a/README
+++ b/README
@@ -3,15 +3,17 @@
 
 Maintainer/Enhancer
 
-    Bryan Stansell (bryan@gnac.com) of GNAC, Inc.
+    Bryan Stansell (bryan@conserver.com) of Certainty Solutions, Inc. -
+    formerly Global Networking and Computing (GNAC)
 
 
 Announcement Mailing List?
 
-    Is anyone out there interested in being on an announcement mailing
-    list for conserver? If so, drop me a line (bryan@gnac.com) and
-    let me know. I'll start by sending messages when a new version is
-    posted, and perhaps it will grow into something more.
+    Is anyone out there interested in being on an announcement
+    mailing list for conserver? If so, drop me a line
+    (bryan@conserver.com) and let me know. I'll start by sending
+    messages when a new version is posted, and perhaps it will grow into
+    something more.
 
 Origin
 
@@ -25,17 +27,17 @@ Origin
     continued fixing things and adding features we found useful.
 
 
-The GNAC Version
+The Certainty Solutions Version
 
-    The result is a combination of many people's work.  We (GNAC)
-    are releasing this combination in hopes that it will help others.
-    There is no warranty or support implied by our distribution of
-    the software.
+    The result is a combination of many people's work.  We (Certainty
+    Solutions) are releasing this combination in hopes that it will help
+    others.  There is no warranty or support implied by our distribution
+    of the software.
 
 
 Downloading
 
-    The latest version can be found at ftp://ftp.gnac.com/pub/conserver/.
+    The latest version can be found at ftp://ftp.conserver.com/conserver/.
 
 
 Other Good Information
@@ -46,5 +48,5 @@ Other Good Information
     (http://www.gnac.com/consoles/).
 
 #
-#  $Id: README,v 1.8 2000-03-06 19:47:06-08 bryan Exp $
+#  $Id: README,v 1.9 2000-09-08 16:14:23-07 bryan Exp $
 #
diff --git a/conserver/cons-default.h b/conserver/cons-default.h
index 7aeee62..b9a1bbe 100644
--- a/conserver/cons-default.h
+++ b/conserver/cons-default.h
@@ -1,5 +1,5 @@
 /*
- *  $Id: cons-default.h,v 1.4 2000-03-06 17:10:56-08 bryan Exp $
+ *  $Id: cons-default.h,v 1.5 2000-09-08 16:09:04-07 bryan Exp $
  *
  *  Copyright GNAC, Inc., 1998
  *
@@ -7,29 +7,43 @@
  */
 
 /*
---- Socket used to communicate
-#define PORT		782
-    or
+ * Socket used to communicate
+ * Choose either PORT or SERVICE...
+ */
+/*#define PORT		782*/
 #define SERVICE		"conserver"
 
---- Hostname of console server
+/*
+ * Hostname of console server
+ */
 #define HOST		"console"
 
---- Config file path
+/*
+ * Config file path
+ */
 #define CONFIG		"/etc/conserver.cf"
 
---- Password file path
+/*
+ * Password file path
+ */
 #define PASSWD_FILE	"/etc/conserver.passwd"
 
---- Number of consoles per child process
+/*
+ * Number of consoles per child process
+ */
 #define MAXMEMB		8
 
---- Number of child processes
+/*
+ * Number of child processes
+ */
 #define MAXGRP		32
 
---- Clear parity (high-bit) [true/false setting]
+/*
+ * Clear parity (high-bit) [true/false setting]
+ */
 #define CPARITY		1
 
---- TCP connection timeout
+/*
+ * TCP connection timeout
+ */
 #define CONNECTTIMEOUT	60
-*/
diff --git a/conserver/version.h b/conserver/version.h
index f0be836..351c612 100644
--- a/conserver/version.h
+++ b/conserver/version.h
@@ -1,9 +1,9 @@
 /*
- *  $Id: version.h,v 1.15 2000-03-02 02:47:22-08 bryan Exp $
+ *  $Id: version.h,v 1.16 2000-09-08 16:12:59-07 bryan Exp $
  *
  *  Copyright GNAC, Inc., 1998
  *
  *  Maintainer/Enhancer: Bryan Stansell (bryan@gnac.com)
  */
 
-#define GNAC_VERSION "GNAC version 6.15"
+#define GNAC_VERSION "Certainty Solutions version 6.16"