diff --git a/ChangeLog b/ChangeLog
index dc6db0ea4..c6323e1d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-01  Fred Kiefer <FredKiefer@gmx.de>
+
+        * Source/NSXMLNode.m (-XMLStringWithOptions:): Use macros for
+	versions of libxml2.
+
 2012-11-28  Richard Frith-Macdonald <rfm@gnu.org>
 
         * configure.ac: Fixup ICU test error
diff --git a/Source/NSXMLNode.m b/Source/NSXMLNode.m
index 69668df47..6fc2d071b 100644
--- a/Source/NSXMLNode.m
+++ b/Source/NSXMLNode.m
@@ -1981,10 +1981,8 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
 - (NSString*) XMLStringWithOptions: (NSUInteger)theOptions
 {
   NSString     *string = nil;
-  xmlChar      *buf = NULL;
   xmlBufferPtr buffer;
   int error = 0;
-  int len = 0;
   int xmlOptions = 0;
 
   buffer = xmlBufferCreate();
@@ -2037,9 +2035,11 @@ execute_xpath(xmlNodePtr node, NSString *xpath_exp, NSDictionary *constants,
       xmlBufferFree(buffer);
       return nil;
     }
-  buf = buffer->content;
-  len = buffer->use;
-  string = StringFromXMLString(buf, len);
+#if LIBXML_VERSION < 20900
+  string = StringFromXMLString(buffer->content, buffer->use);
+#else
+  string = StringFromXMLString(xmlBufContent(buffer), xmlBufUse(buffer));
+#endif
   xmlBufferFree(buffer);
 
   if ([self kind] == NSXMLTextKind)