diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java
new file mode 100644
index 000000000..23eb4d9f4
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/XDataManager.java
@@ -0,0 +1,37 @@
+/**
+ *
+ * Copyright 2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdata;
+
+import org.jivesoftware.smack.ConnectionCreationListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.XMPPConnectionRegistry;
+import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.xdata.packet.DataForm;
+
+public class XDataManager {
+
+    static {
+        XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
+            @Override
+            public void connectionCreated(XMPPConnection connection) {
+                ServiceDiscoveryManager serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
+                serviceDiscoveryManager.addFeature(DataForm.NAMESPACE);
+            }
+        });
+    }
+
+}
diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/XDataLayoutManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/XDataLayoutManager.java
new file mode 100644
index 000000000..3e322ae64
--- /dev/null
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/XDataLayoutManager.java
@@ -0,0 +1,37 @@
+/**
+ *
+ * Copyright 2014 Florian Schmaus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.xdatalayout;
+
+import org.jivesoftware.smack.ConnectionCreationListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.XMPPConnectionRegistry;
+import org.jivesoftware.smackx.disco.ServiceDiscoveryManager;
+import org.jivesoftware.smackx.xdatalayout.packet.DataLayout;
+
+public class XDataLayoutManager {
+
+    static {
+        XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() {
+            @Override
+            public void connectionCreated(XMPPConnection connection) {
+                ServiceDiscoveryManager serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(connection);
+                serviceDiscoveryManager.addFeature(DataLayout.NAMESPACE);
+            }
+        });
+    }
+
+}
diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml b/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml
index dc28e7537..45ae5acb7 100644
--- a/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml
+++ b/smack-extensions/src/main/resources/org.jivesoftware.smackx/extensions.xml
@@ -12,5 +12,7 @@
         <className>org.jivesoftware.smackx.privacy.PrivacyListManager</className>
         <className>org.jivesoftware.smackx.time.EntityTimeManager</className>
         <className>org.jivesoftware.smackx.vcardtemp.VCardManager</className>
+        <className>org.jivesoftware.smackx.xdata.XDataManager</className>
+        <className>org.jivesoftware.smackx.xdatalayout.XDataLayoutManager</className>
     </startupClasses>
 </smack>