diff --git a/include/config.h b/include/config.h
index 6ba69963..1b5a37b1 100644
--- a/include/config.h
+++ b/include/config.h
@@ -57,12 +57,12 @@
 
 /* files */
 #define SPATH    BINPATH "/" PROGRAM_PREFIX "charybdis"		   /* ircd executable */
-#define CPATH    ETCPATH "/ircd.conf"		   /* ircd.conf file */
-#define MPATH    ETCPATH "/ircd.motd"		   /* MOTD file */
-#define LPATH    LOGPATH "/ircd.log"		   /* ircd logfile */
-#define PPATH    PKGRUNDIR "/ircd.pid"		   /* pid file */
-#define OPATH    ETCPATH "/opers.motd"		   /* oper MOTD file */
-#define DBPATH   PKGLOCALSTATEDIR "/ban.db"                 /* bandb file */
+#define CPATH    ETCPATH "/ircd.conf"		                   /* ircd.conf file */
+#define MPATH    ETCPATH "/ircd.motd"		                   /* MOTD file */
+#define LPATH    LOGPATH "/ircd.log"		                   /* ircd logfile */
+#define PPATH    PKGRUNDIR "/ircd.pid"		                   /* pid file */
+#define OPATH    ETCPATH "/opers.motd"		                   /* oper MOTD file */
+#define DBPATH   PKGLOCALSTATEDIR "/ban.db"                        /* bandb file */
 
 /* IGNORE_BOGUS_TS
  * Ignore bogus timestamps from other servers. Yes this will desync
@@ -72,6 +72,11 @@
  */
 #undef  IGNORE_BOGUS_TS
 
+/* ENABLE_OPER_CHGHOST
+ * Allow opers to use the CHGHOST command. Potentially abusive.
+ */
+#undef	ENABLE_OPER_CHGHOST
+
 /* HANGONGOODLINK and HANGONRETRYDELAY
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY
@@ -80,7 +85,6 @@
  * (HANGONGOODLINK) and we give the net few seconds to steady
  * (HANGONRETRYDELAY). This latter has to be long enough that the
  * other end of the connection has time to notice it broke too.
- * 1997/09/18 recommended values by ThemBones for modern EFnet
  */
 #define HANGONRETRYDELAY 60	/* Recommended value: 30-60 seconds */
 #define HANGONGOODLINK 3600	/* Recommended value: 30-60 minutes */
diff --git a/include/config.h.dist b/include/config.h.dist
index f143506e..1b5a37b1 100644
--- a/include/config.h.dist
+++ b/include/config.h.dist
@@ -27,7 +27,7 @@
 
 #include "setup.h"
 
-/* 
+/*
  * Directory paths and filenames for UNIX systems.
  * IRCD_PREFIX is set using ./configure --prefix, see INSTALL.
  * The other defaults should be fine.
@@ -50,7 +50,7 @@
 #define BINPATH IRCD_PREFIX "/bin/"
 #define MODPATH MODULE_DIR
 #define AUTOMODPATH MODULE_DIR "/autoload/"
-#define ETCPATH ETC_DIR 
+#define ETCPATH ETC_DIR
 #define LOGPATH LOG_DIR
 #define UHPATH   HELP_DIR "/users"
 #define HPATH  HELP_DIR "/opers"
@@ -72,6 +72,11 @@
  */
 #undef  IGNORE_BOGUS_TS
 
+/* ENABLE_OPER_CHGHOST
+ * Allow opers to use the CHGHOST command. Potentially abusive.
+ */
+#undef	ENABLE_OPER_CHGHOST
+
 /* HANGONGOODLINK and HANGONRETRYDELAY
  * Often net breaks for a short time and it's useful to try to
  * establishing the same connection again faster than CONNECTFREQUENCY
@@ -80,7 +85,6 @@
  * (HANGONGOODLINK) and we give the net few seconds to steady
  * (HANGONRETRYDELAY). This latter has to be long enough that the
  * other end of the connection has time to notice it broke too.
- * 1997/09/18 recommended values by ThemBones for modern EFnet
  */
 #define HANGONRETRYDELAY 60	/* Recommended value: 30-60 seconds */
 #define HANGONGOODLINK 3600	/* Recommended value: 30-60 minutes */
@@ -92,7 +96,7 @@
 #define KILLCHASETIMELIMIT 90	/* Recommended value: 90 */
 
 /* CHARYBDIS_SOMAXCONN
- * Use SOMAXCONN if OS has it, otherwise use this value for the 
+ * Use SOMAXCONN if OS has it, otherwise use this value for the
  * listen(); backlog.  5 for AIX/SUNOS, 25 for other OSs.
  */
 #define CHARYBDIS_SOMAXCONN 25