diff --git a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
index 18da4bdcb..15d2f76ee 100644
--- a/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
+++ b/source/org/jivesoftware/smackx/ServiceDiscoveryManager.java
@@ -143,6 +143,10 @@ public class ServiceDiscoveryManager {
     private void init() {
         // Register the new instance and associate it with the connection 
         instances.put(connection, this);
+
+        addFeature(DiscoverInfo.NAMESPACE);
+        addFeature(DiscoverItems.NAMESPACE);
+
         // Add a listener to the connection that removes the registered instance when
         // the connection is closed
         connection.addConnectionListener(new ConnectionListener() {
diff --git a/source/org/jivesoftware/smackx/packet/DiscoverInfo.java b/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
index eeda1bfc8..4f4597d67 100644
--- a/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
+++ b/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
@@ -39,6 +39,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public class DiscoverInfo extends IQ {
 
+    public static final String NAMESPACE = "http://jabber.org/protocol/disco#info";
+
     private final List<Feature> features = new CopyOnWriteArrayList<Feature>();
     private final List<Identity> identities = new CopyOnWriteArrayList<Identity>();
     private String node;
@@ -133,7 +135,7 @@ public class DiscoverInfo extends IQ {
 
     public String getChildElementXML() {
         StringBuilder buf = new StringBuilder();
-        buf.append("<query xmlns=\"http://jabber.org/protocol/disco#info\"");
+        buf.append("<query xmlns=\"" + NAMESPACE + "\"");
         if (getNode() != null) {
             buf.append(" node=\"");
             buf.append(StringUtils.escapeForXML(getNode()));
diff --git a/source/org/jivesoftware/smackx/packet/DiscoverItems.java b/source/org/jivesoftware/smackx/packet/DiscoverItems.java
index d1ea1b954..f6b6dcae1 100644
--- a/source/org/jivesoftware/smackx/packet/DiscoverItems.java
+++ b/source/org/jivesoftware/smackx/packet/DiscoverItems.java
@@ -39,6 +39,8 @@ import java.util.concurrent.CopyOnWriteArrayList;
  */
 public class DiscoverItems extends IQ {
 
+    public static final String NAMESPACE = "http://jabber.org/protocol/disco#items";
+
     private final List<Item> items = new CopyOnWriteArrayList<Item>();
     private String node;
 
@@ -92,7 +94,7 @@ public class DiscoverItems extends IQ {
 
     public String getChildElementXML() {
         StringBuilder buf = new StringBuilder();
-        buf.append("<query xmlns=\"http://jabber.org/protocol/disco#items\"");
+        buf.append("<query xmlns=\"" + NAMESPACE + "\"");
         if (getNode() != null) {
             buf.append(" node=\"");
             buf.append(StringUtils.escapeForXML(getNode()));