diff --git a/plugins/Math.py b/plugins/Math.py
index 1ecccc200..b921c042c 100644
--- a/plugins/Math.py
+++ b/plugins/Math.py
@@ -45,7 +45,7 @@ import string
 from itertools import imap
 
 import supybot.utils as utils
-from supybot.commands import additional, optional, wrap
+from supybot.commands import *
 import supybot.callbacks as callbacks
 
 import convertcore
diff --git a/src/Channel.py b/src/Channel.py
index b40d382e6..1a356dcdf 100755
--- a/src/Channel.py
+++ b/src/Channel.py
@@ -48,8 +48,8 @@ from itertools import imap
 import supybot.conf as conf
 import supybot.ircdb as ircdb
 import supybot.utils as utils
+from supybot.commands import *
 import supybot.ircmsgs as ircmsgs
-from supybot.commands import wrap
 import supybot.schedule as schedule
 import supybot.ircutils as ircutils
 import supybot.registry as registry