diff --git a/plugins/Filter.py b/plugins/Filter.py
index c3e81fbc4..946337dbf 100644
--- a/plugins/Filter.py
+++ b/plugins/Filter.py
@@ -278,6 +278,16 @@ class Filter(callbacks.Privmsg):
         "7" : "--...",
         "8" : "---..",
         "9" : "----.",
+        "." : ".-.-.-",
+        "," : "--..--",
+        ":" : "---...",
+        "?" : "..--..",
+        "'" : ".----.",
+        "-" : "-....-",
+        "/" : "-..-.",
+        '"' : ".-..-.",
+        "@" : ".--.-.",
+        "=" : "-...-"
     }
     _revcode = dict([(y, x) for (x, y) in _code.items()])
     _unmorsere = re.compile('([.-]+)')