diff --git a/extensions/m_adminwall.c b/extensions/m_adminwall.c
index 9f492f9f..1c7f20a1 100644
--- a/extensions/m_adminwall.c
+++ b/extensions/m_adminwall.c
@@ -47,7 +47,11 @@ struct Message adminwall_msgtab = {
 
 
 mapi_clist_av1 adminwall_clist[] = { &adminwall_msgtab, NULL };
-DECLARE_MODULE_AV2(adminwall, NULL, NULL, adminwall_clist, NULL, NULL, NULL, NULL, NULL);
+
+static const char adminwall_desc[] =
+        "Provides the ADMINWALL command to send a message to all administrators";
+
+DECLARE_MODULE_AV2(adminwall, NULL, NULL, adminwall_clist, NULL, NULL, NULL, NULL, adminwall_desc);
 
 
 /*
diff --git a/extensions/m_echotags.c b/extensions/m_echotags.c
index c000a080..49f649c5 100644
--- a/extensions/m_echotags.c
+++ b/extensions/m_echotags.c
@@ -7,13 +7,15 @@
 static int m_echotags(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message echotags_msgtab = {
-  "ECHOTAGS", 0, 0, 0, 0,
-  { mg_ignore, {m_echotags, 0}, mg_ignore, mg_ignore, mg_ignore, {m_echotags, 0} }
+	"ECHOTAGS", 0, 0, 0, 0,
+	{ mg_ignore, {m_echotags, 0}, mg_ignore, mg_ignore, mg_ignore, {m_echotags, 0} }
 };
 
 mapi_clist_av1 echotags_clist[] = { &echotags_msgtab, NULL };
 
-DECLARE_MODULE_AV2(echotags, NULL, NULL, echotags_clist, NULL, NULL, NULL, NULL, NULL);
+static const char echotags_desc = "A test module for tags";
+
+DECLARE_MODULE_AV2(echotags, NULL, NULL, echotags_clist, NULL, NULL, NULL, NULL, echotags_desc);
 
 static int
 m_echotags(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/extensions/m_extendchans.c b/extensions/m_extendchans.c
index 939edbf9..b3ce38b8 100644
--- a/extensions/m_extendchans.c
+++ b/extensions/m_extendchans.c
@@ -41,7 +41,10 @@ struct Message extendchans_msgtab = {
 
 mapi_clist_av1 extendchans_clist[] = { &extendchans_msgtab, NULL };
 
-DECLARE_MODULE_AV2(extendchans, NULL, NULL, extendchans_clist, NULL, NULL, NULL, NULL, NULL);
+static const char extendchans_desc =
+	"Allow an oper or service to let a given user join more channels";
+
+DECLARE_MODULE_AV2(extendchans, NULL, NULL, extendchans_clist, NULL, NULL, NULL, NULL, extendchans_desc);
 
 static int
 mo_extendchans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
@@ -62,7 +65,7 @@ mo_extendchans(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *
 
 	if((target_p = find_chasing(source_p, parv[1], NULL)) == NULL)
 		return 0;
-	
+
 	/* Is the target user local? */
 	if(MyClient(target_p))
 	{
diff --git a/extensions/m_findforwards.c b/extensions/m_findforwards.c
index 09a65519..ff8efff4 100644
--- a/extensions/m_findforwards.c
+++ b/extensions/m_findforwards.c
@@ -44,7 +44,9 @@ struct Message findforwards_msgtab = {
 
 mapi_clist_av1 findforwards_clist[] = { &findforwards_msgtab, NULL };
 
-DECLARE_MODULE_AV2(findforwards, NULL, NULL, findforwards_clist, NULL, NULL, NULL, NULL, NULL);
+static const char findfowards_desc = "Allows operators to find forwards to a given channel";
+
+DECLARE_MODULE_AV2(findforwards, NULL, NULL, findforwards_clist, NULL, NULL, NULL, NULL, findfowards_desc);
 
 /*
 ** mo_findforwards
diff --git a/extensions/m_identify.c b/extensions/m_identify.c
index 9f2cb5ff..c2f26d80 100644
--- a/extensions/m_identify.c
+++ b/extensions/m_identify.c
@@ -59,7 +59,9 @@ mapi_clist_av1 identify_clist[] = {
 	NULL
 };
 
-DECLARE_MODULE_AV2(identify, NULL, NULL, identify_clist, NULL, NULL, NULL, NULL, NULL);
+static const char identify_desc[] = "Adds the IDENTIFY alias that forwards to NickServ or ChanServ";
+
+DECLARE_MODULE_AV2(identify, NULL, NULL, identify_clist, NULL, NULL, NULL, NULL, identify_desc);
 
 static int m_identify(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
diff --git a/extensions/m_mkpasswd.c b/extensions/m_mkpasswd.c
index 5981fbcc..7b9352ce 100644
--- a/extensions/m_mkpasswd.c
+++ b/extensions/m_mkpasswd.c
@@ -36,7 +36,9 @@ struct Message mkpasswd_msgtab = {
 
 mapi_clist_av1 mkpasswd_clist[] = { &mkpasswd_msgtab, NULL };
 
-DECLARE_MODULE_AV2(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, NULL, NULL, NULL);
+const char mkpasswd_desc[] = "Hash a password for use in ircd.conf";
+
+DECLARE_MODULE_AV2(mkpasswd, NULL, NULL, mkpasswd_clist, NULL, NULL, NULL, NULL, mkpasswd_desc);
 
 
 /* m_mkpasswd - mkpasswd message handler
diff --git a/extensions/m_ojoin.c b/extensions/m_ojoin.c
index 7a1a29b9..dec3fbe7 100644
--- a/extensions/m_ojoin.c
+++ b/extensions/m_ojoin.c
@@ -37,7 +37,6 @@
 
 static int mo_ojoin(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
-
 struct Message ojoin_msgtab = {
 	"OJOIN", 0, 0, 0, 0,
 	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_ojoin, 2}}
@@ -45,7 +44,9 @@ struct Message ojoin_msgtab = {
 
 mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
 
-DECLARE_MODULE_AV2(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, NULL, NULL, NULL);
+static const char ojoin_desc[] = "Allow admins to forcibly join channels with the OJOIN command";
+
+DECLARE_MODULE_AV2(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, NULL, NULL, ojoin_desc);
 
 /*
 ** mo_ojoin
diff --git a/extensions/m_okick.c b/extensions/m_okick.c
index b5397a09..01da58ab 100644
--- a/extensions/m_okick.c
+++ b/extensions/m_okick.c
@@ -48,7 +48,9 @@ struct Message okick_msgtab = {
 
 mapi_clist_av1 okick_clist[] = { &okick_msgtab, NULL };
 
-DECLARE_MODULE_AV2(okick, NULL, NULL, okick_clist, NULL, NULL, NULL, NULL, NULL);
+static const char okick_desc[] = "Allow admins to forcibly kick users from channels with the OKICK command";
+
+DECLARE_MODULE_AV2(okick, NULL, NULL, okick_clist, NULL, NULL, NULL, NULL, okick_desc);
 
 /*
 ** m_okick
diff --git a/extensions/m_omode.c b/extensions/m_omode.c
index fdc141ed..91caf405 100644
--- a/extensions/m_omode.c
+++ b/extensions/m_omode.c
@@ -51,7 +51,9 @@ struct Message omode_msgtab = {
 
 mapi_clist_av1 omode_clist[] = { &omode_msgtab, NULL };
 
-DECLARE_MODULE_AV2(omode, NULL, NULL, omode_clist, NULL, NULL, NULL, NULL, NULL);
+static const char omode_desc[] = "Allow admins to forcibly change modes on channels with the OMODE command";
+
+DECLARE_MODULE_AV2(omode, NULL, NULL, omode_clist, NULL, NULL, NULL, NULL, omode_desc);
 
 /*
  * mo_omode - MODE command handler
diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 11be4dbe..def7fe56 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -43,8 +43,9 @@ struct Message opme_msgtab = {
 
 mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL };
 
-DECLARE_MODULE_AV2(opme, NULL, NULL, opme_clist, NULL, NULL, NULL, NULL, NULL);
+static const char opme_desc[] = "Allow admins to op themselves on opless channels";
 
+DECLARE_MODULE_AV2(opme, NULL, NULL, opme_clist, NULL, NULL, NULL, NULL, opme_desc);
 
 /*
 ** mo_opme
diff --git a/extensions/m_roleplay.c b/extensions/m_roleplay.c
index 0e3f8709..6802f80b 100644
--- a/extensions/m_roleplay.c
+++ b/extensions/m_roleplay.c
@@ -29,6 +29,9 @@
 #include "packet.h"
 #include "messages.h"
 
+static const char roleplay_desc[] =
+	"Adds a roleplaying system that allows faked nicknames to talk in a channel set +N";
+
 static int m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static int m_fsay(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 static int m_faction(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
@@ -95,7 +98,7 @@ struct Message roleplay_msgtab = {
 
 mapi_clist_av1 roleplay_clist[] = { &scene_msgtab, &ambiance_msgtab, &fsay_msgtab, &faction_msgtab, &npc_msgtab, &npca_msgtab, &roleplay_msgtab, NULL };
 
-DECLARE_MODULE_AV2(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, NULL, NULL, NULL);
+DECLARE_MODULE_AV2(roleplay, _modinit, _moddeinit, roleplay_clist, NULL, NULL, NULL, NULL, roleplay_desc);
 
 static int
 m_scene(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
diff --git a/extensions/m_sendbans.c b/extensions/m_sendbans.c
index ec9d049e..b08f7c2c 100644
--- a/extensions/m_sendbans.c
+++ b/extensions/m_sendbans.c
@@ -57,7 +57,10 @@ mapi_clist_av1 sendbans_clist[] = {
 	NULL
 };
 
-DECLARE_MODULE_AV2(sendbans, NULL, NULL, sendbans_clist, NULL, NULL, NULL, NULL, NULL);
+static const char sendbands_desc[] =
+	"Adds the ability to send all permanent RESVs and XLINEs to given server";
+
+DECLARE_MODULE_AV2(sendbans, NULL, NULL, sendbans_clist, NULL, NULL, NULL, NULL, sendbands_desc);
 
 static const char *expand_xline(const char *mask)
 {
diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index c2bcf809..fe0a4ae2 100644
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -61,7 +61,10 @@ struct Message webirc_msgtab = {
 };
 
 mapi_clist_av1 webirc_clist[] = { &webirc_msgtab, NULL };
-DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, NULL);
+
+static const char webirc_desc[] = "Adds support for the WebIRC system";
+
+DECLARE_MODULE_AV2(webirc, NULL, NULL, webirc_clist, NULL, NULL, NULL, NULL, webirc_desc);
 
 /*
  * mr_webirc - webirc message handler