--- a/sat_pubsub/tap.py	Mon Dec 15 13:14:53 2014 +0100
+++ b/sat_pubsub/tap.py	Mon Oct 13 14:53:42 2014 +0200
@@ -60,9 +60,9 @@
 from wokkel.disco import DiscoHandler
 from wokkel.generic import FallbackHandler, VersionHandler
 from wokkel.iwokkel import IPubSubResource
-from wokkel.pubsub import PubSubService
+from wokkel import pubsub, rsm
 
-from sat_pubsub import __version__
+from sat_pubsub import __version__, const
 from sat_pubsub.backend import BackendService
 from sat_pubsub.remote_roster import RosterClient
 
@@ -141,7 +141,7 @@
     resource.hideNodes = config["hide-nodes"]
     resource.serviceJID = config["jid"]
 
-    ps = PubSubService(resource)
+    ps = (rsm if const.FLAG_ENABLE_RSM else pubsub).PubSubService(resource)
     ps.setHandlerParent(cs)
     resource.pubsubService = ps