diff --git a/plugins/Alias/plugin.py b/plugins/Alias/plugin.py
index 6d68fba16..f614dd1e7 100644
--- a/plugins/Alias/plugin.py
+++ b/plugins/Alias/plugin.py
@@ -317,11 +317,12 @@ class Alias(callbacks.Plugin):
             irc.error(_('There is no such alias.'))
     unlock = wrap(unlock, [('checkCapability', 'admin'), 'commandName'])
 
-    _validNameRe = re.compile(r'^[a-z.|!][a-z0-9.|!]*$')
+    _validNameRe = re.compile(r'^[a-z.|!?][a-z0-9.|!]*$')
     def addAlias(self, irc, name, alias, lock=False):
         if not self._validNameRe.search(name):
             raise AliasError('Names can only contain alphanumerical '
-                    'characters, dots, pipes, and exclamation marks '
+                    'characters, dots, pipes, and '
+                    'exclamation/interrogatin marks '
                     '(and the first character cannot be a number).')
         realName = callbacks.canonicalName(name)
         if name != realName: