diff --git a/ChangeLog b/ChangeLog
index 176750a16..94ca2bffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,14 @@
-2012-03-12  Fred Kiefer <FredKiefer@gmx.de>
+2012-03-16  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSXMLNode.m (-XMLStringWithOptions:): Protect the
+	different format constants with version checks.
+
+2012-03-14  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSXMLDocument.m (-XMLDataWithOptions:): Correct convesion
 	to NSData. Add some comments.
 
-2012-03-12  Fred Kiefer <FredKiefer@gmx.de>
+2012-03-14  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSXMLPrivate.h: Add comments on owner policy.
 	* Source/NSXMLNode.m (-XMLStringWithOptions:): Reimplement to
diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m
index e0e7d6f6e..157e495a3 100644
--- a/Source/NSXMLNode.m
+++ b/Source/NSXMLNode.m
@@ -1514,19 +1514,27 @@ execute_xpath(NSXMLNode *xmlNode, NSString *xpath_exp, NSString *nmspaces)
   buffer = xmlBufferCreate();
 
   // XML_SAVE_XHTML XML_SAVE_AS_HTML XML_SAVE_NO_DECL XML_SAVE_NO_XHTML
+#if LIBXML_VERSION >= 20702
   xmlOptions |= XML_SAVE_AS_XML;
+#endif
+#if LIBXML_VERSION >= 20708
   if (options & NSXMLNodePreserveWhitespace)
     {
       xmlOptions |= XML_SAVE_WSNONSIG;
     }
+#endif
+#if LIBXML_VERSION >= 20622
   if (options & NSXMLNodeCompactEmptyElement)
     {
       xmlOptions |= XML_SAVE_NO_EMPTY;
     }
+#endif
+#if LIBXML_VERSION >= 20617
   if (options & NSXMLNodePrettyPrint)
     {
       xmlOptions |= XML_SAVE_FORMAT;
     }
+#endif
   
   ctxt = xmlSaveToBuffer(buffer, "utf-8", xmlOptions);
   xmlSaveTree(ctxt, internal->node);