2 files changed, 18 insertions, 10 deletions
diff --git a/sleekxmpp/plugins/xep_0115/__init__.py b/sleekxmpp/plugins/xep_0115/__init__.py
index f4892f84..31a2c03a 100644
--- a/sleekxmpp/plugins/xep_0115/__init__.py
+++ b/sleekxmpp/plugins/xep_0115/__init__.py
@@ -6,6 +6,15 @@
     See the file LICENSE for copying permission.
 """
 
+from sleekxmpp.plugins.base import register_plugin
+
 from sleekxmpp.plugins.xep_0115.stanza import Capabilities
 from sleekxmpp.plugins.xep_0115.static import StaticCaps
-from sleekxmpp.plugins.xep_0115.caps import xep_0115
+from sleekxmpp.plugins.xep_0115.caps import XEP_0115
+
+
+register_plugin(XEP_0115)
+
+
+# Retain some backwards compatibility
+xep_0115 = XEP_0115
diff --git a/sleekxmpp/plugins/xep_0115/caps.py b/sleekxmpp/plugins/xep_0115/caps.py
index 7cf64031..3aa0f70f 100644
--- a/sleekxmpp/plugins/xep_0115/caps.py
+++ b/sleekxmpp/plugins/xep_0115/caps.py
@@ -15,25 +15,26 @@ from sleekxmpp.stanza import StreamFeatures, Presence, Iq
 from sleekxmpp.xmlstream import register_stanza_plugin, JID
 from sleekxmpp.xmlstream.handler import Callback
 from sleekxmpp.xmlstream.matcher import StanzaPath
-from sleekxmpp.exceptions import XMPPError
-from sleekxmpp.plugins.base import base_plugin
+from sleekxmpp.exceptions import XMPPError, IqError, IqTimeout
+from sleekxmpp.plugins import BasePlugin
 from sleekxmpp.plugins.xep_0115 import stanza, StaticCaps
 
 
 log = logging.getLogger(__name__)
 
 
-class xep_0115(base_plugin):
+class XEP_0115(BasePlugin):
 
     """
     XEP-0115: Entity Capabalities
     """
 
-    def plugin_init(self):
-        self.xep = '0115'
-        self.description = 'Entity Capabilities'
-        self.stanza = stanza
+    name = 'xep_0115'
+    description = 'XEP-0115: Entity Capabilities'
+    dependencies = set(['xep_0030', 'xep_0128', 'xep_0004'])
+    stanza = stanza
 
+    def plugin_init(self):
         self.hashes = {'sha-1': hashlib.sha1, 
                        'md5': hashlib.md5}
 
@@ -71,8 +72,6 @@ class xep_0115(base_plugin):
                     restart=False,
                     order=10010)
 
-    def post_init(self):
-        base_plugin.post_init(self)
         self.xmpp['xep_0030'].add_feature(stanza.Capabilities.namespace)
 
         disco = self.xmpp['xep_0030']