diff --git a/Makefile.windows b/Makefile.windows
index 4e468bba9..1bfebf24a 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -386,8 +386,8 @@ DLL_FILES=\
  src/modules/usermodes/secureonlymsg.dll \
  src/modules/usermodes/servicebot.dll \
  src/modules/usermodes/showwhois.dll \
+ src/modules/usermodes/wallops.dll \
  src/modules/vhost.dll \
- src/modules/wallops.dll \
  src/modules/watch-backend.dll \
  src/modules/watch.dll \
  src/modules/webirc.dll \
@@ -1215,12 +1215,12 @@ src/modules/usermodes/servicebot.dll: src/modules/usermodes/servicebot.c $(INCLU
 src/modules/usermodes/showwhois.dll: src/modules/usermodes/showwhois.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/usermodes/showwhois.c /Fesrc/modules/usermodes/ /Fosrc/modules/usermodes/ /Fdsrc/modules/usermodes/showwhois.pdb $(MODLFLAGS)
 
+src/modules/usermodes/wallops.dll: src/modules/usermodes/wallops.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/usermodes/wallops.c /Fesrc/modules/usermodes/ /Fosrc/modules/usermodes/ /Fdsrc/modules/usermodes/wallops.pdb $(MODLFLAGS)
+
 src/modules/vhost.dll: src/modules/vhost.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/vhost.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/vhost.pdb $(MODLFLAGS)
 
-src/modules/wallops.dll: src/modules/wallops.c $(INCLUDES)
-	$(CC) $(MODCFLAGS) src/modules/wallops.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/wallops.pdb $(MODLFLAGS)
-
 src/modules/watch-backend.dll: src/modules/watch-backend.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/watch-backend.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/watch-backend.pdb $(MODLFLAGS)
 
diff --git a/doc/conf/modules.default.conf b/doc/conf/modules.default.conf
index 5d8da4681..3fb8971a2 100644
--- a/doc/conf/modules.default.conf
+++ b/doc/conf/modules.default.conf
@@ -105,7 +105,6 @@ loadmodule "tkl"; /* also server-to-server */
 loadmodule "trace";
 loadmodule "tsctl";
 loadmodule "unsqline";
-loadmodule "wallops";
 loadmodule "jumpserver";
 
 // Server-to-server commands
@@ -180,6 +179,7 @@ loadmodule "chanmodes/history"; /* +H */
 
 
 /*** User modes ***/
+loadmodule "usermodes/wallops"; /* +w (listen to /WALLOPS messages) */
 loadmodule "usermodes/bot"; /* +B (mark yourself as a bot) */
 loadmodule "usermodes/servicebot"; /* +S (service bot) */
 loadmodule "usermodes/noctcp"; /* +T (block CTCP's) */
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
index 278ff6157..50e322fe3 100644
--- a/src/modules/Makefile.in
+++ b/src/modules/Makefile.in
@@ -49,7 +49,7 @@ MODULES= \
 	invite.so list.so time.so svskill.so sjoin.so \
 	pass.so userhost.so ison.so silence.so knock.so \
 	umode2.so squit.so protoctl.so addomotd.so \
-	wallops.so admin.so globops.so locops.so \
+	admin.so globops.so locops.so \
 	trace.so netinfo.so links.so help.so rules.so \
 	close.so map.so eos.so server.so stats.so \
 	dccdeny.so whowas.so \
diff --git a/src/modules/usermodes/Makefile.in b/src/modules/usermodes/Makefile.in
index d4ed96b0f..d94014143 100644
--- a/src/modules/usermodes/Makefile.in
+++ b/src/modules/usermodes/Makefile.in
@@ -33,7 +33,7 @@ INCLUDES = ../../include/channel.h \
 
 R_MODULES=\
 	noctcp.so censor.so bot.so showwhois.so nokick.so servicebot.so \
-	privacy.so regonlymsg.so secureonlymsg.so privdeaf.so
+	privacy.so regonlymsg.so secureonlymsg.so privdeaf.so wallops.so
 
 MODULES=$(R_MODULES)
 MODULEFLAGS=@MODULEFLAGS@
diff --git a/src/modules/wallops.c b/src/modules/usermodes/wallops.c
similarity index 96%
rename from src/modules/wallops.c
rename to src/modules/usermodes/wallops.c
index 10c8b0571..41b005200 100644
--- a/src/modules/wallops.c
+++ b/src/modules/usermodes/wallops.c
@@ -1,6 +1,6 @@
 /*
- *   IRC - Internet Relay Chat, src/modules/wallops.c
- *   (C) 2004 The UnrealIRCd Team
+ *   IRC - Internet Relay Chat, src/modules/usermodes/wallops.c
+ *   (C) 2004-2021 The UnrealIRCd Team
  *
  *   See file AUTHORS in IRC package for additional names of
  *   the programmers.