diff --git a/source/org/jivesoftware/smackx/packet/DiscoverInfo.java b/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
index 0dd1f36af..38ebd6141 100644
--- a/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
+++ b/source/org/jivesoftware/smackx/packet/DiscoverInfo.java
@@ -161,12 +161,13 @@ public class DiscoverInfo extends IQ {
 
     public String getChildElementXML() {
         StringBuffer buf = new StringBuffer();
-        buf.append("<query xmlns=\"http://jabber.org/protocol/disco#info");
+        buf.append("<query xmlns=\"http://jabber.org/protocol/disco#info\"");
         if (getNode() != null) {
-            buf.append(" node=");
+            buf.append(" node=\"");
             buf.append(getNode());
+            buf.append("\"");
         }
-        buf.append("\">");
+        buf.append(">");
         synchronized (identities) {
             for (int i = 0; i < identities.size(); i++) {
                 Identity identity = (Identity) identities.get(i);
diff --git a/source/org/jivesoftware/smackx/packet/DiscoverItems.java b/source/org/jivesoftware/smackx/packet/DiscoverItems.java
index 853d94b9d..0f4ff9d0d 100644
--- a/source/org/jivesoftware/smackx/packet/DiscoverItems.java
+++ b/source/org/jivesoftware/smackx/packet/DiscoverItems.java
@@ -120,12 +120,13 @@ public class DiscoverItems extends IQ {
 
     public String getChildElementXML() {
         StringBuffer buf = new StringBuffer();
-        buf.append("<query xmlns=\"http://jabber.org/protocol/disco#items");
+        buf.append("<query xmlns=\"http://jabber.org/protocol/disco#items\"");
         if (getNode() != null) {
-            buf.append(" node=");
+            buf.append(" node=\"");
             buf.append(getNode());
+            buf.append("\"");
         }
-        buf.append("\">");
+        buf.append(">");
         synchronized (items) {
             for (int i = 0; i < items.size(); i++) {
                 Item item = (Item) items.get(i);