diff --git a/plugins/Filter.py b/plugins/Filter.py
index a52a533a4..7a511fcfc 100644
--- a/plugins/Filter.py
+++ b/plugins/Filter.py
@@ -607,12 +607,13 @@ class Filter(callbacks.Privmsg):
         irc.reply(out.getvalue())
     spellit = wrap(spellit, ['text'])
 
-    def gnu(self, irc, msg, args):
+    def gnu(self, irc, msg, args, text):
         """<text>
 
-        Returns <text> as RMS would say it.
+        Returns <text> as GNU/RMS would say it.
         """
-        irc.reply(' '.join(['GNU/' + s for s in args]))
+        irc.reply(' '.join(['GNU/' + s for s in text.split()]))
+    gnu = wrap(gnu, ['text'])
 
 
 Class = Filter
diff --git a/test/test_Filter.py b/test/test_Filter.py
index 81cde915d..1e81f46e2 100644
--- a/test/test_Filter.py
+++ b/test/test_Filter.py
@@ -153,5 +153,8 @@ class FilterTest(ChannelPluginTestCase, PluginDocumentation):
 
     def testGnu(self):
         self.assertResponse('gnu foo bar baz', 'GNU/foo GNU/bar GNU/baz')
+        self.assertNotError('outfilter gnu')
+        self.assertResponse('echo foo bar baz', 'GNU/foo GNU/bar GNU/baz')
+        self.assertNotError('outfilter')
 
 # vim:set shiftwidth=4 tabstop=8 expandtab textwidth=78: