diff --git a/Changes b/Changes
index 61a6f6155..c91be6a72 100644
--- a/Changes
+++ b/Changes
@@ -1247,3 +1247,4 @@ seen. gmtime warning still there
 *** beta8 released ***
 - Added log {} syslog support (appears to work fine) [#0000099]
 - Added HOOKTYPE_JOIN
+- Converted all modules to 3.2-b8 format (passes ModuleInfo)
diff --git a/src/modules/l_commands.c b/src/modules/l_commands.c
index 5dcd2f4ee..c1482267c 100644
--- a/src/modules/l_commands.c
+++ b/src/modules/l_commands.c
@@ -73,19 +73,19 @@ ModuleHeader l_commands_Header
  * want to
 */
 
-extern int m_sethost_Init(int module_load), m_setname_Init(int module_load), m_chghost_Init(int module_load);
-extern int m_chgident_Init(int module_load), m_setident_Init(int module_load), m_sdesc_Init(int module_load);
-extern int m_svsmode_Init(int module_load), m_swhois_Init(int module_load), m_svsmotd_Init(int module_load);
-extern int m_svsnline_Init(int module_load), m_who_Init(int module_load), m_mkpasswd_Init(int module_load);
-extern int m_away_Init(int module_load), m_svsnoop_Init(int module_load), m_svso_Init(int module_load);
-extern int m_svsnick_Init(int module_load), m_adminchat_Init(int module_load), m_nachat_Init(int module_load);
-extern int m_lag_Init(int module_load), m_rping_Init(int module_load), m_sendumode_Init(int module_load);
-extern int m_tsctl_Init(int module_load), m_htm_Init(int module_load), m_chgname_Init(int module_load);
-extern int m_message_Init(int module_load), m_whois_Init(int module_load), m_quit_Init(int module_load);
-extern int m_kill_Init(int module_load), m_pingpong_Init(int module_load), m_oper_Init(int module_load);
-extern int m_akill_Init(int module_load), m_rakill_Init(int module_load), m_zline_Init(int module_load);
-extern int m_unzline_Init(int module_load), m_kline_Init(int module_load), m_unkline_Init(int module_load);
-extern int m_sqline_Init(int module_load), m_unsqline_Init(int module_load), m_tkl_Init(int module_load);
+extern int m_sethost_Init(ModuleInfo *modinfo), m_setname_Init(ModuleInfo *modinfo), m_chghost_Init(ModuleInfo *modinfo);
+extern int m_chgident_Init(ModuleInfo *modinfo), m_setident_Init(ModuleInfo *modinfo), m_sdesc_Init(ModuleInfo *modinfo);
+extern int m_svsmode_Init(ModuleInfo *modinfo), m_swhois_Init(ModuleInfo *modinfo), m_svsmotd_Init(ModuleInfo *modinfo);
+extern int m_svsnline_Init(ModuleInfo *modinfo), m_who_Init(ModuleInfo *modinfo), m_mkpasswd_Init(ModuleInfo *modinfo);
+extern int m_away_Init(ModuleInfo *modinfo), m_svsnoop_Init(ModuleInfo *modinfo), m_svso_Init(ModuleInfo *modinfo);
+extern int m_svsnick_Init(ModuleInfo *modinfo), m_adminchat_Init(ModuleInfo *modinfo), m_nachat_Init(ModuleInfo *modinfo);
+extern int m_lag_Init(ModuleInfo *modinfo), m_rping_Init(ModuleInfo *modinfo), m_sendumode_Init(ModuleInfo *modinfo);
+extern int m_tsctl_Init(ModuleInfo *modinfo), m_htm_Init(ModuleInfo *modinfo), m_chgname_Init(ModuleInfo *modinfo);
+extern int m_message_Init(ModuleInfo *modinfo), m_whois_Init(ModuleInfo *modinfo), m_quit_Init(ModuleInfo *modinfo);
+extern int m_kill_Init(ModuleInfo *modinfo), m_pingpong_Init(ModuleInfo *modinfo), m_oper_Init(ModuleInfo *modinfo);
+extern int m_akill_Init(ModuleInfo *modinfo), m_rakill_Init(ModuleInfo *modinfo), m_zline_Init(ModuleInfo *modinfo);
+extern int m_unzline_Init(ModuleInfo *modinfo), m_kline_Init(ModuleInfo *modinfo), m_unkline_Init(ModuleInfo *modinfo);
+extern int m_sqline_Init(ModuleInfo *modinfo), m_unsqline_Init(ModuleInfo *modinfo), m_tkl_Init(ModuleInfo *modinfo);
 #ifdef GUEST
 extern int m_guest_Init(ModuleInfo *modinfo);
 #endif
@@ -145,47 +145,47 @@ int    l_commands_Init(ModuleInfo *modinfo)
 	*/
 	bcopy(modinfo,&ModCmdsInfo,modinfo->size);
 	module_load = ModCmdsInfo.module_load;
-	m_sethost_Init(module_load);
-	m_setname_Init(module_load);
-	m_chghost_Init(module_load);
-	m_chgident_Init(module_load);
-	m_setident_Init(module_load);
-	m_sdesc_Init(module_load);
-	m_svsmode_Init(module_load);
-	m_swhois_Init(module_load);
-	m_svsmotd_Init(module_load);
-	m_svsnline_Init(module_load);
-	m_who_Init(module_load);
-	m_mkpasswd_Init(module_load);
-	m_away_Init(module_load);
-	m_svsnoop_Init(module_load);
-	m_svso_Init(module_load);
-	m_svsnick_Init(module_load);
-	m_adminchat_Init(module_load);
-	m_nachat_Init(module_load);
-	m_lag_Init(module_load);
-	m_rping_Init(module_load);
-	m_sendumode_Init(module_load);
-	m_tsctl_Init(module_load);
-	m_htm_Init(module_load);
-	m_chgname_Init(module_load);
-	m_message_Init(module_load);
-	m_whois_Init(module_load);
-	m_quit_Init(module_load);
-	m_kill_Init(module_load);
-	m_pingpong_Init(module_load);
-	m_oper_Init(module_load);
-	m_akill_Init(module_load);
-	m_rakill_Init(module_load);
-	m_zline_Init(module_load);
-	m_unzline_Init(module_load);
-	m_kline_Init(module_load);
-	m_unkline_Init(module_load);
-	m_sqline_Init(module_load);
-	m_unsqline_Init(module_load);
-	m_tkl_Init(module_load);
+	m_sethost_Init(&ModCmdsInfo);
+	m_setname_Init(&ModCmdsInfo);
+	m_chghost_Init(&ModCmdsInfo);
+	m_chgident_Init(&ModCmdsInfo);
+	m_setident_Init(&ModCmdsInfo);
+	m_sdesc_Init(&ModCmdsInfo);
+	m_svsmode_Init(&ModCmdsInfo);
+	m_swhois_Init(&ModCmdsInfo);
+	m_svsmotd_Init(&ModCmdsInfo);
+	m_svsnline_Init(&ModCmdsInfo);
+	m_who_Init(&ModCmdsInfo);
+	m_mkpasswd_Init(&ModCmdsInfo);
+	m_away_Init(&ModCmdsInfo);
+	m_svsnoop_Init(&ModCmdsInfo);
+	m_svso_Init(&ModCmdsInfo);
+	m_svsnick_Init(&ModCmdsInfo);
+	m_adminchat_Init(&ModCmdsInfo);
+	m_nachat_Init(&ModCmdsInfo);
+	m_lag_Init(&ModCmdsInfo);
+	m_rping_Init(&ModCmdsInfo);
+	m_sendumode_Init(&ModCmdsInfo);
+	m_tsctl_Init(&ModCmdsInfo);
+	m_htm_Init(&ModCmdsInfo);
+	m_chgname_Init(&ModCmdsInfo);
+	m_message_Init(&ModCmdsInfo);
+	m_whois_Init(&ModCmdsInfo);
+	m_quit_Init(&ModCmdsInfo);
+	m_kill_Init(&ModCmdsInfo);
+	m_pingpong_Init(&ModCmdsInfo);
+	m_oper_Init(&ModCmdsInfo);
+	m_akill_Init(&ModCmdsInfo);
+	m_rakill_Init(&ModCmdsInfo);
+	m_zline_Init(&ModCmdsInfo);
+	m_unzline_Init(&ModCmdsInfo);
+	m_kline_Init(&ModCmdsInfo);
+	m_unkline_Init(&ModCmdsInfo);
+	m_sqline_Init(&ModCmdsInfo);
+	m_unsqline_Init(&ModCmdsInfo);
+	m_tkl_Init(&ModCmdsInfo);
 #ifdef GUEST
-	m_guest_Init(module_load);
+	m_guest_Init(&ModCmdsInfo);
 #endif
 #ifdef SCAN_API
         p.header = &scan_socks_Header;
diff --git a/src/modules/m_adminchat.c b/src/modules/m_adminchat.c
index 9a299c979..9f74a8f4b 100644
--- a/src/modules/m_adminchat.c
+++ b/src/modules/m_adminchat.c
@@ -59,7 +59,7 @@ ModuleHeader Mod_Header
 	"adminchat",	/* Name of module */
 	"$Id$", /* Version */
 	"command /adchat", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -70,9 +70,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_adminchat_Init(int module_load)
+int    m_adminchat_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_akill.c b/src/modules/m_akill.c
index 03328c5dc..b2c7f8acc 100644
--- a/src/modules/m_akill.c
+++ b/src/modules/m_akill.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"akill",	/* Name of module */
 	"$Id$", /* Version */
 	"command /akill", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_akill_Init(int module_load)
+int    m_akill_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_away.c b/src/modules/m_away.c
index 52657f993..cc0addc95 100644
--- a/src/modules/m_away.c
+++ b/src/modules/m_away.c
@@ -62,14 +62,14 @@ ModuleHeader Mod_Header
 	"m_away",
 	"$Id$",
 	"command /away", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_away_Init(int module_load)
+int    m_away_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_AWAY, TOK_AWAY, m_away, 1);
diff --git a/src/modules/m_chghost.c b/src/modules/m_chghost.c
index 538ef458b..0a5b457e2 100644
--- a/src/modules/m_chghost.c
+++ b/src/modules/m_chghost.c
@@ -58,7 +58,7 @@ ModuleHeader Mod_Header
 	"chghost",	/* Name of module */
 	"$Id$", /* Version */
 	"/chghost", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
     };
 
 /*
@@ -67,9 +67,9 @@ ModuleHeader Mod_Header
 */
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_chghost_Init(int module_load)
+int    m_chghost_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_chgident.c b/src/modules/m_chgident.c
index 903734f68..e86767d63 100644
--- a/src/modules/m_chgident.c
+++ b/src/modules/m_chgident.c
@@ -59,7 +59,7 @@ ModuleHeader Mod_Header
 	"chgident",	/* Name of module */
 	"$Id$", /* Version */
 	"/chgident", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -69,9 +69,9 @@ ModuleHeader Mod_Header
 */
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int   m_chgident_Init(int module_load)
+int   m_chgident_Init(ModuleInfo *modinfo)
 #endif
 {
 	/* extern variable to export m_chgident_info to temporary
diff --git a/src/modules/m_chgname.c b/src/modules/m_chgname.c
index c2752d391..db8d9f79a 100644
--- a/src/modules/m_chgname.c
+++ b/src/modules/m_chgname.c
@@ -59,7 +59,7 @@ ModuleHeader Mod_Header
 	"chgname",	/* Name of module */
 	"$Id$", /* Version */
 	"command /chgname", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -70,9 +70,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_chgname_Init(int module_load)
+int    m_chgname_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_dummy.c b/src/modules/m_dummy.c
index e6719f4a5..6b975423c 100644
--- a/src/modules/m_dummy.c
+++ b/src/modules/m_dummy.c
@@ -43,7 +43,7 @@ ModuleHeader Mod_Header
 	"dummy",	/* Name of module */
 	"$Id$", /* Version */
 	"command /dummy", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -54,9 +54,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_dummy_Init(int module_load)
+int    m_dummy_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_htm.c b/src/modules/m_htm.c
index 5a50ebb7f..4e0c910d3 100644
--- a/src/modules/m_htm.c
+++ b/src/modules/m_htm.c
@@ -81,7 +81,7 @@ ModuleHeader Mod_Header
 	"htm",	/* Name of module */
 	"$Id$", /* Version */
 	"command /htm", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -92,9 +92,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_htm_Init(int module_load)
+int    m_htm_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_kill.c b/src/modules/m_kill.c
index 6a25dc7fb..59a42d57c 100644
--- a/src/modules/m_kill.c
+++ b/src/modules/m_kill.c
@@ -61,7 +61,7 @@ ModuleHeader Mod_Header
 	"kill",	/* Name of module */
 	"$Id$", /* Version */
 	"command /kill", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -72,9 +72,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_kill_Init(int module_load)
+int    m_kill_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_kline.c b/src/modules/m_kline.c
index 2ce989bc1..27978a114 100644
--- a/src/modules/m_kline.c
+++ b/src/modules/m_kline.c
@@ -61,7 +61,7 @@ ModuleHeader Mod_Header
 	"kline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /kline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -72,9 +72,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_kline_Init(int module_load)
+int    m_kline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_lag.c b/src/modules/m_lag.c
index 0133987f4..e0ccf5559 100644
--- a/src/modules/m_lag.c
+++ b/src/modules/m_lag.c
@@ -59,7 +59,7 @@ ModuleHeader Mod_Header
 	"lag",	/* Name of module */
 	"$Id$", /* Version */
 	"command /lag", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -70,9 +70,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_lag_Init(int module_load)
+int    m_lag_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_message.c b/src/modules/m_message.c
index 5494fa1c1..7a66b3a3b 100644
--- a/src/modules/m_message.c
+++ b/src/modules/m_message.c
@@ -66,7 +66,7 @@ ModuleHeader Mod_Header
 	"message",	/* Name of module */
 	"$Id$", /* Version */
 	"private message and notice", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -77,9 +77,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_message_Init(int module_load)
+int    m_message_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_mkpasswd.c b/src/modules/m_mkpasswd.c
index af9b0bd93..b7e153c38 100644
--- a/src/modules/m_mkpasswd.c
+++ b/src/modules/m_mkpasswd.c
@@ -62,14 +62,14 @@ ModuleHeader Mod_Header
 	"m_mkpasswd",
 	"$Id$",
 	"command /mkpasswd", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_mkpasswd_Init(int module_load)
+int    m_mkpasswd_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_MKPASSWD, TOK_MKPASSWD, m_mkpasswd, MAXPARA);
diff --git a/src/modules/m_nachat.c b/src/modules/m_nachat.c
index 7668f6ef5..33f2821c4 100644
--- a/src/modules/m_nachat.c
+++ b/src/modules/m_nachat.c
@@ -59,7 +59,7 @@ ModuleHeader Mod_Header
 	"Nachat",	/* Name of module */
 	"$Id$", /* Version */
 	"command /nachat", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -70,9 +70,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_nachat_Init(int module_load)
+int    m_nachat_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_oper.c b/src/modules/m_oper.c
index 175c9f06e..9506957a8 100644
--- a/src/modules/m_oper.c
+++ b/src/modules/m_oper.c
@@ -95,7 +95,7 @@ ModuleHeader Mod_Header
 	"oper",	/* Name of module */
 	"$Id$", /* Version */
 	"command /oper", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -106,9 +106,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_oper_Init(int module_load)
+int    m_oper_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_pingpong.c b/src/modules/m_pingpong.c
index 4aef71206..f78ca1f59 100644
--- a/src/modules/m_pingpong.c
+++ b/src/modules/m_pingpong.c
@@ -67,7 +67,7 @@ ModuleHeader Mod_Header
 	"pingpong",	/* Name of module */
 	"$Id$", /* Version */
 	"ping, pong and nospoof", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -78,9 +78,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_pingpong_Init(int module_load)
+int    m_pingpong_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_quit.c b/src/modules/m_quit.c
index 2693411b1..4668337bf 100644
--- a/src/modules/m_quit.c
+++ b/src/modules/m_quit.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"quit",	/* Name of module */
 	"$Id$", /* Version */
 	"command /quit", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_quit_Init(int module_load)
+int    m_quit_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_rakill.c b/src/modules/m_rakill.c
index 3a60bfb7a..af8838b68 100644
--- a/src/modules/m_rakill.c
+++ b/src/modules/m_rakill.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"rakill",	/* Name of module */
 	"$Id$", /* Version */
 	"command /rakill", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_rakill_Init(int module_load)
+int    m_rakill_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_rping.c b/src/modules/m_rping.c
index 49cc657cc..33c5e9fcb 100644
--- a/src/modules/m_rping.c
+++ b/src/modules/m_rping.c
@@ -64,7 +64,7 @@ ModuleHeader Mod_Header
 	"rping",	/* Name of module */
 	"$Id$", /* Version */
 	"command /rping, /rpong", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -75,9 +75,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_rping_Init(int module_load)
+int    m_rping_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_sdesc.c b/src/modules/m_sdesc.c
index f9835e407..3b5bd07b4 100644
--- a/src/modules/m_sdesc.c
+++ b/src/modules/m_sdesc.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"sdesc",	/* Name of module */
 	"$Id$", /* Version */
 	"command /sdesc", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -70,9 +70,9 @@ ModuleHeader Mod_Header
 */
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_sdesc_Init(int module_load)
+int    m_sdesc_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_sendumode.c b/src/modules/m_sendumode.c
index 1886e21c8..471715ebe 100644
--- a/src/modules/m_sendumode.c
+++ b/src/modules/m_sendumode.c
@@ -63,7 +63,7 @@ ModuleHeader Mod_Header
 	"sendumode",	/* Name of module */
 	"$Id$", /* Version */
 	"command /sendumode", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -74,9 +74,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_sendumode_Init(int module_load)
+int    m_sendumode_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_sethost.c b/src/modules/m_sethost.c
index 878d9f214..26f4c91b0 100644
--- a/src/modules/m_sethost.c
+++ b/src/modules/m_sethost.c
@@ -59,7 +59,7 @@ ModuleHeader Mod_Header
 	"sethost",	/* Name of module */
 	"$Id$", /* Version */
 	"command /sethost", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -69,9 +69,9 @@ ModuleHeader Mod_Header
 */
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_sethost_Init(int module_load)
+int    m_sethost_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_setident.c b/src/modules/m_setident.c
index 4a3c5bfc6..582daf014 100644
--- a/src/modules/m_setident.c
+++ b/src/modules/m_setident.c
@@ -58,7 +58,7 @@ ModuleHeader Mod_Header
 	"setident",	/* Name of module */
 	"$Id$", /* Version */
 	"/setident", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -68,9 +68,9 @@ ModuleHeader Mod_Header
 */
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_setident_Init(int module_load)
+int    m_setident_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_setname.c b/src/modules/m_setname.c
index 04b4ab155..c0c6f491c 100644
--- a/src/modules/m_setname.c
+++ b/src/modules/m_setname.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"setname",	/* Name of module */
 	"$Id$", /* Version */
 	"command /setname", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -70,9 +70,9 @@ ModuleHeader Mod_Header
 */
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_setname_Init(int module_load)
+int    m_setname_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_sqline.c b/src/modules/m_sqline.c
index 24a825f2b..7d220efe8 100644
--- a/src/modules/m_sqline.c
+++ b/src/modules/m_sqline.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"sqline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /sqline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_sqline_Init(int module_load)
+int    m_sqline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_svsmode.c b/src/modules/m_svsmode.c
index a2521600d..92960f5a4 100644
--- a/src/modules/m_svsmode.c
+++ b/src/modules/m_svsmode.c
@@ -65,14 +65,14 @@ ModuleHeader Mod_Header
 	"m_svsmode",
 	"$Id$",
 	"command /svsmode and svs2mode", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_svsmode_Init(int module_load)
+int    m_svsmode_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_SVSMODE, TOK_SVSMODE, m_svsmode, MAXPARA);
diff --git a/src/modules/m_svsmotd.c b/src/modules/m_svsmotd.c
index 33055f694..b564d0121 100644
--- a/src/modules/m_svsmotd.c
+++ b/src/modules/m_svsmotd.c
@@ -62,14 +62,14 @@ ModuleHeader Mod_Header
 	"m_svsmotd",
 	"$Id$",
 	"command /svsmotd", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_svsmotd_Init(int module_load)
+int    m_svsmotd_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_SVSMOTD, TOK_SVSMOTD, m_svsmotd, MAXPARA);
diff --git a/src/modules/m_svsnick.c b/src/modules/m_svsnick.c
index 83dfe7675..1b5ac8495 100644
--- a/src/modules/m_svsnick.c
+++ b/src/modules/m_svsnick.c
@@ -62,14 +62,14 @@ ModuleHeader Mod_Header
 	"m_svsnick",
 	"$Id$",
 	"command /svsnick", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_svsnick_Init(int module_load)
+int    m_svsnick_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_SVSNICK, TOK_SVSNICK, m_svsnick, MAXPARA);
diff --git a/src/modules/m_svsnline.c b/src/modules/m_svsnline.c
index 69544606b..afd5152a9 100644
--- a/src/modules/m_svsnline.c
+++ b/src/modules/m_svsnline.c
@@ -62,7 +62,7 @@ ModuleHeader Mod_Header
 	"svsnline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /svsnline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -73,9 +73,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_svsnline_Init(int module_load)
+int    m_svsnline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_svsnoop.c b/src/modules/m_svsnoop.c
index f8c5054bb..51ebf81c3 100644
--- a/src/modules/m_svsnoop.c
+++ b/src/modules/m_svsnoop.c
@@ -66,14 +66,14 @@ ModuleHeader Mod_Header
 	"m_svsnoop",
 	"$Id$",
 	"command /svsnoop", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_svsnoop_Init(int module_load)
+int    m_svsnoop_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_SVSNOOP, TOK_SVSNOOP, m_svsnoop, MAXPARA);
diff --git a/src/modules/m_svso.c b/src/modules/m_svso.c
index 99cb8fd47..8f0e4de72 100644
--- a/src/modules/m_svso.c
+++ b/src/modules/m_svso.c
@@ -96,14 +96,14 @@ ModuleHeader Mod_Header
 	"m_svso",
 	"$Id$",
 	"command /svso", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_svso_Init(int module_load)
+int    m_svso_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_SVSO, TOK_SVSO, m_svso, MAXPARA);
diff --git a/src/modules/m_swhois.c b/src/modules/m_swhois.c
index b1a8c3a5b..5343800db 100644
--- a/src/modules/m_swhois.c
+++ b/src/modules/m_swhois.c
@@ -61,14 +61,14 @@ ModuleHeader Mod_Header
 	"m_swhois",
 	"$Id$",
 	"command /swhois", 
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_swhois_Init(int module_load)
+int    m_swhois_Init(ModuleInfo *modinfo)
 #endif
 {
 	add_Command(MSG_SWHOIS, TOK_SWHOIS, m_swhois, MAXPARA);
diff --git a/src/modules/m_tkl.c b/src/modules/m_tkl.c
index 14c94bd2d..5b3423fe9 100644
--- a/src/modules/m_tkl.c
+++ b/src/modules/m_tkl.c
@@ -55,7 +55,7 @@ ModuleHeader Mod_Header
 	"tkl",	/* Name of module */
 	"$Id$", /* Version */
 	"commands /gline etc", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -66,9 +66,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_tkl_Init(int module_load)
+int    m_tkl_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_tsctl.c b/src/modules/m_tsctl.c
index 39c056bc4..3e388727c 100644
--- a/src/modules/m_tsctl.c
+++ b/src/modules/m_tsctl.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"tsctl",	/* Name of module */
 	"$Id$", /* Version */
 	"command /tsctl", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_tsctl_Init(int module_load)
+int    m_tsctl_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_unkline.c b/src/modules/m_unkline.c
index 57ec4a501..101f7c989 100644
--- a/src/modules/m_unkline.c
+++ b/src/modules/m_unkline.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"unkline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /unkline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_unkline_Init(int module_load)
+int    m_unkline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_unsqline.c b/src/modules/m_unsqline.c
index c74de3548..290fe03f5 100644
--- a/src/modules/m_unsqline.c
+++ b/src/modules/m_unsqline.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"unsqline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /unsqline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_unsqline_Init(int module_load)
+int    m_unsqline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_unzline.c b/src/modules/m_unzline.c
index 11c4d2a1e..dbb8b47ce 100644
--- a/src/modules/m_unzline.c
+++ b/src/modules/m_unzline.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"unzline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /unzline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_unzline_Init(int module_load)
+int    m_unzline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_who.c b/src/modules/m_who.c
index 00bd5a767..a569d8383 100644
--- a/src/modules/m_who.c
+++ b/src/modules/m_who.c
@@ -63,7 +63,7 @@ ModuleHeader Mod_Header
 	"who",	/* Name of module */
 	"$Id$", /* Version */
 	"command /who", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -74,9 +74,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_who_Init(int module_load)
+int    m_who_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_whois.c b/src/modules/m_whois.c
index f28cff1c9..45ad9cf48 100644
--- a/src/modules/m_whois.c
+++ b/src/modules/m_whois.c
@@ -62,7 +62,7 @@ ModuleHeader Mod_Header
 	"whois",	/* Name of module */
 	"$Id$", /* Version */
 	"command /whois", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -73,9 +73,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_whois_Init(int module_load)
+int    m_whois_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*
diff --git a/src/modules/m_zline.c b/src/modules/m_zline.c
index 3c2fd05ea..aaab0e1ea 100644
--- a/src/modules/m_zline.c
+++ b/src/modules/m_zline.c
@@ -60,7 +60,7 @@ ModuleHeader Mod_Header
 	"zline",	/* Name of module */
 	"$Id$", /* Version */
 	"command /zline", /* Short description of module */
-	"3.2-b5",
+	"3.2-b8-1",
 	NULL 
     };
 
@@ -71,9 +71,9 @@ ModuleHeader Mod_Header
 
 /* This is called on module init, before Server Ready */
 #ifdef DYNAMIC_LINKING
-DLLFUNC int	Mod_Init(int module_load)
+DLLFUNC int	Mod_Init(ModuleInfo *modinfo)
 #else
-int    m_zline_Init(int module_load)
+int    m_zline_Init(ModuleInfo *modinfo)
 #endif
 {
 	/*