diff --git a/modules/m_links.c b/modules/m_links.c
index 29c759f5..4366ed80 100644
--- a/modules/m_links.c
+++ b/modules/m_links.c
@@ -54,7 +54,10 @@ mapi_hlist_av1 links_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV2(links, NULL, NULL, links_clist, links_hlist, NULL, NULL, NULL, NULL);
+static const char links_desc[] =
+	"Provides the LINKS command to view servers linked to the host server";
+
+DECLARE_MODULE_AV2(links, NULL, NULL, links_clist, links_hlist, NULL, NULL, NULL, links_desc);
 
 /*
  * m_links - LINKS message handler
diff --git a/modules/m_list.c b/modules/m_list.c
index 80f9d9da..3f2d44dc 100644
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -81,7 +81,9 @@ mapi_hfn_list_av1 list_hfnlist[] = {
 	{NULL, NULL}
 };
 
-DECLARE_MODULE_AV2(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, NULL, NULL, NULL);
+static const char list_desc[] = "Provides the LIST command to clients to view non-hidden channels";
+
+DECLARE_MODULE_AV2(list, _modinit, _moddeinit, list_clist, NULL, list_hfnlist, NULL, NULL, list_desc);
 
 static struct ev_entry *iterate_clients_ev = NULL;
 
diff --git a/modules/m_locops.c b/modules/m_locops.c
index 29bb7570..abd44049 100644
--- a/modules/m_locops.c
+++ b/modules/m_locops.c
@@ -47,7 +47,11 @@ struct Message locops_msgtab = {
 };
 
 mapi_clist_av1 locops_clist[] = { &locops_msgtab, NULL };
-DECLARE_MODULE_AV2(locops, NULL, NULL, locops_clist, NULL, NULL, NULL, NULL, NULL);
+
+static const char locops_desc[] =
+	"Provides the LOCOPS command to send a message to all local operators";
+
+DECLARE_MODULE_AV2(locops, NULL, NULL, locops_clist, NULL, NULL, NULL, NULL, locops_desc);
 
 /*
  * m_locops - LOCOPS message handler
diff --git a/modules/m_lusers.c b/modules/m_lusers.c
index 7816066e..d88dc783 100644
--- a/modules/m_lusers.c
+++ b/modules/m_lusers.c
@@ -43,14 +43,18 @@ struct Message lusers_msgtab = {
 };
 
 mapi_clist_av1 lusers_clist[] = { &lusers_msgtab, NULL };
-DECLARE_MODULE_AV2(lusers, NULL, NULL, lusers_clist, NULL, NULL, NULL, NULL, NULL);
+
+static const char lusers_desc[] =
+	"Provides the LUSERS command to view the number of current and maximum lusers on a server";
+
+DECLARE_MODULE_AV2(lusers, NULL, NULL, lusers_clist, NULL, NULL, NULL, NULL, lusers_desc);
 
 /*
  * m_lusers - LUSERS message handler
  * parv[1] = host/server mask.
  * parv[2] = server to query
  *
- * 199970918 JRL hacked to ignore parv[1] completely and require parc > 3
+ * 19970918 JRL hacked to ignore parv[1] completely and require parc > 3
  * to cause a force
  */
 static int
diff --git a/modules/m_map.c b/modules/m_map.c
index ed7bcc56..5b05ef7c 100644
--- a/modules/m_map.c
+++ b/modules/m_map.c
@@ -39,7 +39,10 @@ struct Message map_msgtab = {
 };
 
 mapi_clist_av1 map_clist[] = { &map_msgtab, NULL };
-DECLARE_MODULE_AV2(map, NULL, NULL, map_clist, NULL, NULL, NULL, NULL, NULL);
+
+static const char map_desc[] = "Provides the MAP command to view network topology information";
+
+DECLARE_MODULE_AV2(map, NULL, NULL, map_clist, NULL, NULL, NULL, NULL, map_clist);
 
 static void dump_map(struct Client *client_p, struct Client *root, char *pbuf);
 static void flattened_map(struct Client *client_p);
diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index 2a26af86..d7ec2abd 100644
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -49,7 +49,10 @@ struct Message monitor_msgtab = {
 };
 
 mapi_clist_av1 monitor_clist[] = { &monitor_msgtab, NULL };
-DECLARE_MODULE_AV2(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, NULL, NULL, NULL);
+
+static const char monitor_desc[] = "Provides the MONITOR facility for tracking user signon and signoff";
+
+DECLARE_MODULE_AV2(monitor, monitor_init, monitor_deinit, monitor_clist, NULL, NULL, NULL, NULL, monitor_desc);
 
 static int monitor_init(void)
 {
diff --git a/modules/m_motd.c b/modules/m_motd.c
index b81c8e98..873825b7 100644
--- a/modules/m_motd.c
+++ b/modules/m_motd.c
@@ -52,7 +52,9 @@ mapi_hlist_av1 motd_hlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV2(motd, NULL, NULL, motd_clist, motd_hlist, NULL, NULL, NULL, NULL);
+static const char motd_desc[] = "Provides the MOTD command to view the Message of the Day";
+
+DECLARE_MODULE_AV2(motd, NULL, NULL, motd_clist, motd_hlist, NULL, NULL, NULL, motd_desc);
 
 static void motd_spy(struct Client *);