diff --git a/sys/configuration.h b/sys/configuration.h
index 8ca189e..5bde747 100644
--- a/sys/configuration.h
+++ b/sys/configuration.h
@@ -18,6 +18,7 @@
 #define IC_PROMPT                        9
 #define IC_MAX_COMMANDS                 10
 #define IC_MODIFY_COMMAND               11
+#define IC_ENCODING                     12
 
 /* Possible options for configure_object().
  */
@@ -37,5 +38,26 @@
 #define DC_EXTRA_WIZINFO_SIZE            7
 #define DC_DEFAULT_RUNTIME_LIMITS        8
 #define DC_SWAP_COMPACT_MODE             9
+#define DC_SWAP_TIME                     10
+#define DC_SWAP_VAR_TIME                 11
+#define DC_CLEANUP_TIME                  12
+#define DC_RESET_TIME                    13
+#define DC_DEBUG_FILE                    14
+#define DC_FILESYSTEM_ENCODING           15
+
+#define DC_SIGACTION_SIGHUP              20
+#define DC_SIGACTION_SIGINT              21
+#define DC_SIGACTION_SIGUSR1             22
+#define DC_SIGACTION_SIGUSR2             23
+
+/* Values for the DC_SIGACTION_SIG* options:
+ */
+#define DCS_DEFAULT                      0
+#define DCS_IGNORE                       1
+#define DCS_TERMINATE                    2
+#define DCS_SHUTDOWN                     3
+#define DCS_INFORM_MASTER                4
+#define DCS_RELOAD_MASTER                5
+#define DCS_THROW_EXCEPTION              6
 
 #endif /* LPC_CONFIGURATION_H_ */
diff --git a/sys/driver_hook.h b/sys/driver_hook.h
index 0b97f80..8ca37c1 100644
--- a/sys/driver_hook.h
+++ b/sys/driver_hook.h
@@ -29,8 +29,9 @@
 #define H_PRINT_PROMPT          22
 #define H_REGEXP_PACKAGE        23
 #define H_MSG_DISCARDED         24
+#define H_FILE_ENCODING         25
 
-#define NUM_DRIVER_HOOKS        25  /* Number of hooks */
+#define NUM_DRIVER_HOOKS        26  /* Number of hooks */
 
 #endif /* LPC_DRIVER_HOOK_ */
 
diff --git a/sys/lpctypes.h b/sys/lpctypes.h
index 3c585bc..50af876 100644
--- a/sys/lpctypes.h
+++ b/sys/lpctypes.h
@@ -32,6 +32,7 @@
 #define T_SYMBOL        0x9
 #define T_QUOTED_ARRAY  0xa
 #define T_STRUCT        0xb
+#define T_BYTES         0xc
 
 /* Closure types, stored as secondary type info */
 
diff --git a/sys/telnet.h b/sys/telnet.h
index b4fc976..2779a2a 100644
--- a/sys/telnet.h
+++ b/sys/telnet.h
@@ -117,7 +117,7 @@
 #define  TELOPT_ZMP           93        /* Zenith Mud Protocol */
 #define  TELOPT_MUSHCLIENT   102        /* Mushclient/Aardwolf Protocol */
 #define  TELOPT_ATCP         200        /* Achaea Telnet Client Protocol */
-#define  TELOPT_GMCP         201        /* General Mud Comunication Protocol*/
+#define  TELOPT_GMCP         201        /* Generic Mud Communication Protocol */
 
 #define  NTELOPTS            256        /* was: (1+TELOPT_NEWENV) */
 
@@ -175,7 +175,7 @@
    , "TELOPT 188", "TELOPT 189", "TELOPT 190", "TELOPT 191"
    , "TELOPT 192", "TELOPT 193", "TELOPT 194", "TELOPT 195"
    , "TELOPT 196", "TELOPT 197", "TELOPT 198", "TELOPT 199"
-   , "ATCP", "TELOPT 201", "TELOPT 202", "TELOPT 203"
+   , "ATCP", "GMCP", "TELOPT 202", "TELOPT 203"
    , "TELOPT 204", "TELOPT 205", "TELOPT 206", "TELOPT 207"
    , "TELOPT 208", "TELOPT 209", "TELOPT 210", "TELOPT 211"
    , "TELOPT 212", "TELOPT 213", "TELOPT 214", "TELOPT 215"