diff --git a/ChangeLog b/ChangeLog
index 790402c62..86a96b041 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+	* Added aol filter in the Filter plugin.
+	
 	* Added Nickometer plugin, a translation of Infobot's Nickometer.
 	
 	* Added multiple recipient support for notes.
diff --git a/plugins/Filter.py b/plugins/Filter.py
index 26f6a2c43..c6c493549 100644
--- a/plugins/Filter.py
+++ b/plugins/Filter.py
@@ -83,7 +83,7 @@ class Filter(callbacks.Privmsg):
 
     _filterCommands = ['jeffk', 'leet', 'rot13', 'hexlify', 'binary', 'lithp',
                        'scramble', 'morse', 'reverse', 'colorize', 'squish',
-                       'supa1337', 'colorstrip']
+                       'supa1337', 'colorstrip', 'aol']
     def outfilter(self, irc, msg, args, channel):
         """[<channel>] [<command>]
         
diff --git a/test/test_Filter.py b/test/test_Filter.py
index 8d34b00f5..16b44079d 100644
--- a/test/test_Filter.py
+++ b/test/test_Filter.py
@@ -41,6 +41,7 @@ class FilterTest(ChannelPluginTestCase, PluginDocumentation):
         self.assertNotError('leet foobar')
         self.assertNotError('supa1337 foobar')
         self.assertNotError('lithp meghan sweeney')
+        self.assertNotError('aol I\'m too legit to quit.')
 
     def testJeffk(self):
         for i in range(100):