diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c
index 69ad0fcb..2922a00c 100644
--- a/src/fe-none/irssi.c
+++ b/src/fe-none/irssi.c
@@ -19,9 +19,10 @@
 */
 
 #include "module.h"
+#include "modules.h"
+#include "modules-load.h"
 #include "args.h"
 #include "signals.h"
-#include "modules.h"
 #include "core.h"
 
 #ifdef HAVE_STATIC_PERL
@@ -61,6 +62,8 @@ void noui_init(void)
 	core_init();
 	irc_init();
 
+	module_register("core", "fe-none");
+
 	signal_add("reload", (SIGNAL_FUNC) sig_reload);
 	signal_add("gui exit", (SIGNAL_FUNC) sig_exit);
 
diff --git a/src/irc/bot/bot.c b/src/irc/bot/bot.c
index 7679b155..97068bd5 100644
--- a/src/irc/bot/bot.c
+++ b/src/irc/bot/bot.c
@@ -19,6 +19,7 @@
 */
 
 #include "module.h"
+#include "modules.h"
 
 void bot_irc_commands_deinit(void);
 void bot_irc_commands_init(void);
@@ -38,6 +39,8 @@ void irc_bot_init(void)
 	bot_irc_commands_init();
 	bot_events_init();
 	botnet_init();
+
+        module_register("bot", "irc");
 }
 
 void irc_bot_deinit(void)
diff --git a/src/irc/proxy/proxy.c b/src/irc/proxy/proxy.c
index 84e1ed64..c7dc6418 100644
--- a/src/irc/proxy/proxy.c
+++ b/src/irc/proxy/proxy.c
@@ -23,11 +23,6 @@
 #include "settings.h"
 #include "levels.h"
 
-void irc_proxy_deinit(void)
-{
-	plugin_proxy_listen_deinit();
-}
-
 void irc_proxy_init(void)
 {
 	settings_add_str("irssiproxy", "irssiproxy_ports", "");
@@ -48,4 +43,10 @@ void irc_proxy_init(void)
 	}
 
 	plugin_proxy_listen_init();
+        module_register("proxy", "irc");
+}
+
+void irc_proxy_deinit(void)
+{
+	plugin_proxy_listen_deinit();
 }