3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 5120c2f..16c1dee 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,6 +15,7 @@ Unreleased
   * Split name listing message into multiple 353 messages when needed.
   * Made miniircd start correctly on Windows.
   * Use the same 004 reply syntax as other ircds do.
+  * Fixed wallops command when given no arguments.
 
 1.1 (2015-05-22)
 
diff --git a/README.md b/README.md
index 6a96292..09036d6 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,7 @@ Contributors
 - Alex Wright
 - Jan Fuchs
 - Leandro Lucarella
+- Hanno Foest
 - Martin Maney
 - Matt Baxter
 - Matt Behrens
diff --git a/miniircd b/miniircd
index 33f0976..f7d7315 100755
--- a/miniircd
+++ b/miniircd
@@ -1,7 +1,7 @@
 #! /usr/bin/env python
 # Hey, Emacs! This is -*-python-*-.
 #
-# Copyright (C) 2003-2016 Joel Rosdahl
+# Copyright (C) 2003-2017 Joel Rosdahl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -480,7 +480,8 @@ class Client(object):
 
         def wallops_handler():
             if len(arguments) < 1:
-                self.reply_461(command)
+                self.reply_461("WALLOPS")
+                return
             message = arguments[0]
             for client in server.clients.values():
                 client.message(":%s NOTICE %s :Global notice: %s"