diff --git a/src/plugins/__init__.py b/src/plugins/__init__.py
index df99fdbd..e0cb64ea 100644
--- a/src/plugins/__init__.py
+++ b/src/plugins/__init__.py
@@ -1,7 +1,7 @@
+# TODO: remove this when RSM and MAM are in wokkel
 import wokkel
-from sat.tmp.wokkel import delay, pubsub, rsm, mam
-
-wokkel.delay = delay
-wokkel.pubsub = pubsub
-wokkel.rsm = rsm
-wokkel.mam = mam
+from sat.tmp.wokkel import delay as tmp_delay, pubsub as tmp_pubsub, rsm as tmp_rsm, mam as tmp_mam
+wokkel.delay = tmp_delay
+wokkel.pubsub = tmp_pubsub
+wokkel.rsm = tmp_rsm
+wokkel.mam = tmp_mam
diff --git a/src/plugins/plugin_xep_0313.py b/src/plugins/plugin_xep_0313.py
index fc2bf707..bbc79e9c 100644
--- a/src/plugins/plugin_xep_0313.py
+++ b/src/plugins/plugin_xep_0313.py
@@ -32,10 +32,13 @@ from twisted.words.protocols.jabber import jid
 
 from zope.interface import implements
 
-from wokkel import disco, data_form, mam
-from wokkel.rsm import RSMRequest
+from wokkel import disco, data_form
 from wokkel.generic import parseXml
 
+# TODO: change this when RSM and MAM are in wokkel
+from sat.tmp.wokkel.rsm import RSMRequest
+from sat.tmp.wokkel import mam
+
 
 NS_MAM = 'urn:xmpp:mam:0'
 NS_SF = 'urn:xmpp:forward:0'
diff --git a/src/test/test_plugin_xep_0313.py b/src/test/test_plugin_xep_0313.py
index 24093865..5c2fb3db 100644
--- a/src/test/test_plugin_xep_0313.py
+++ b/src/test/test_plugin_xep_0313.py
@@ -27,8 +27,10 @@ from twisted.words.protocols.jabber.jid import JID
 from twisted.words.xish import domish
 from dateutil.tz import tzutc
 import datetime
-from wokkel.rsm import RSMRequest
-from wokkel.mam import buildForm
+
+# TODO: change this when RSM and MAM are in wokkel
+from sat.tmp.wokkel.rsm import RSMRequest
+from sat.tmp.wokkel.mam import buildForm
 
 NS_PUBSUB = 'http://jabber.org/protocol/pubsub'
 SERVICE = 'sat-pubsub.tazar.int'
diff --git a/src/tmp/wokkel/mam.py b/src/tmp/wokkel/mam.py
index 3eaa6802..94c4beef 100644
--- a/src/tmp/wokkel/mam.py
+++ b/src/tmp/wokkel/mam.py
@@ -16,8 +16,8 @@ from twisted.words.protocols.jabber.xmlstream import IQ, toResponse
 from twisted.words.xish import domish
 from twisted.words.protocols.jabber import jid
 from wokkel.subprotocols import IQHandlerMixin, XMPPHandler
-from wokkel import disco, rsm, data_form
-
+from wokkel import disco, data_form
+import rsm
 
 NS_MAM = 'urn:xmpp:mam:0'