diff --git a/extensions/helpops.c b/extensions/helpops.c
index 4eb942b0d..f1002a3f5 100644
--- a/extensions/helpops.c
+++ b/extensions/helpops.c
@@ -43,6 +43,8 @@ struct Message dehelper_msgtab = {
 
 mapi_clist_av1 helpops_clist[] = { &dehelper_msgtab, NULL };
 
+static const char helpops_desc[] = "The helpops system as used by freenode";
+
 static int mo_dehelper(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char **parv)
 {
 	struct Client *target_p;
diff --git a/extensions/hide_uncommon_channels.c b/extensions/hide_uncommon_channels.c
index ff3c33e90..c9e03a22d 100644
--- a/extensions/hide_uncommon_channels.c
+++ b/extensions/hide_uncommon_channels.c
@@ -19,7 +19,9 @@ mapi_hfn_list_av1 huc_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV2(hide_uncommon_channels, NULL, NULL, NULL, NULL, huc_hfnlist, NULL, NULL, NULL);
+static const char hide_desc[] = "Hides channel memberships not shared";
+
+DECLARE_MODULE_AV2(hide_uncommon_channels, NULL, NULL, NULL, NULL, huc_hfnlist, NULL, NULL, hide_desc);
 
 static void
 h_huc_doing_whois_channel_visibility(hook_data_client *hdata)
diff --git a/extensions/hurt.c b/extensions/hurt.c
index 9181c6ca4..2eb7c76eb 100644
--- a/extensions/hurt.c
+++ b/extensions/hurt.c
@@ -106,14 +106,20 @@ mapi_hfn_list_av1 hurt_hfnlist[] = {
 
 mapi_clist_av1 hurt_clist[] = { &hurt_msgtab, &heal_msgtab, NULL };
 
-DECLARE_MODULE_AV1(
+static const char hurt_desc[] =
+	"Prevents \"hurt\" users from messaging anyone but operators or "
+	"services until they identify or are \"healed\"";
+
+DECLARE_MODULE_AV2(
 	hurt,
 	modinit,
 	modfini,
 	hurt_clist,
 	NULL,
 	hurt_hfnlist,
-	NULL
+	NULL,
+	NULL,
+	hurt_desc
 );
 /* }}} */
 
diff --git a/extensions/ip_cloaking.c b/extensions/ip_cloaking.c
index 9e9dbc226..0e0abb264 100644
--- a/extensions/ip_cloaking.c
+++ b/extensions/ip_cloaking.c
@@ -43,8 +43,10 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, NULL);
+static const char ip_cloaking_desc[] = "IP cloaking module that uses user mode +h";
+
+DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
+			ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/ip_cloaking_3.0.c b/extensions/ip_cloaking_3.0.c
index dbb17655b..d79af222e 100644
--- a/extensions/ip_cloaking_3.0.c
+++ b/extensions/ip_cloaking_3.0.c
@@ -10,7 +10,7 @@
 #include "s_serv.h"
 #include "numeric.h"
 
-/* if you're modifying this module, you'll probably to change this */
+/* if you're modifying this module, you'll probably want to change this */
 #define KEY 0x13748cfa
 
 static int
@@ -39,8 +39,10 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, NULL);
+static const char ip_cloaking_desc[] = "The old IP cloaking mechanism version 3.0";
+
+DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
+	ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/ip_cloaking_4.0.c b/extensions/ip_cloaking_4.0.c
index 1f51ab5f3..a2514ddeb 100644
--- a/extensions/ip_cloaking_4.0.c
+++ b/extensions/ip_cloaking_4.0.c
@@ -43,8 +43,10 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, NULL);
+static const char ip_cloaking_desc[] = "New IP cloaking module that uses user mode +x instead of +h";
+
+DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
+			ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)
diff --git a/extensions/ip_cloaking_old.c b/extensions/ip_cloaking_old.c
index 6dc40b738..e739b1c4f 100644
--- a/extensions/ip_cloaking_old.c
+++ b/extensions/ip_cloaking_old.c
@@ -10,7 +10,7 @@
 #include "s_serv.h"
 #include "numeric.h"
 
-/* if you're modifying this module, you'll probably to change this */
+/* if you're modifying this module, you'll probably want to change this */
 #define KEY 0x13748cfa
 
 static int
@@ -39,8 +39,10 @@ mapi_hfn_list_av1 ip_cloaking_hfnlist[] = {
 	{ NULL, NULL }
 };
 
-DECLARE_MODULE_AV1(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
-			ip_cloaking_hfnlist, NULL);
+static const char ip_cloaking_desc[] = "Very old IP cloaking mechanism";
+
+DECLARE_MODULE_AV2(ip_cloaking, _modinit, _moddeinit, NULL, NULL,
+			ip_cloaking_hfnlist, NULL, NULL, ip_cloaking_desc);
 
 static void
 distribute_hostchange(struct Client *client_p, char *newhost)