Index: src/OFXMLElement.m
==================================================================
--- src/OFXMLElement.m
+++ src/OFXMLElement.m
@@ -42,11 +42,18 @@
 
 @implementation OFXMLElement_OFXMLElementBuilderDelegate
 - (void)elementBuilder: (OFXMLElementBuilder*)builder
        didBuildElement: (OFXMLElement*)element_
 {
-	element = [element_ retain];
+	/*
+	 * Make sure we don't take whitespaces before or after the root element
+	 * into account.
+	 */
+	if ([element_ name] != nil) {
+		assert(element == nil);
+		element = [element_ retain];
+	}
 }
 
 - (void)dealloc
 {
 	[element release];

Index: tests/OFXMLElementTests.m
==================================================================
--- tests/OFXMLElementTests.m
+++ tests/OFXMLElementTests.m
@@ -117,11 +117,12 @@
 	    [[elem[2] XMLString] isEqual:
 	    @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"])
 
 	TEST(@"+[elementWithXMLString:] and -[stringValue]",
 	    [[[OFXMLElement elementWithXMLString:
-	    @"<x>foo<![CDATA[bar]]><y>b<!-- fooo -->az</y>qux</x>"] stringValue]
+	    @"<?xml version='1.0' encoding='UTF-8'?>\r\n<x>foo<![CDATA[bar]]>"
+	    @"<y>b<!-- fooo -->az</y>qux</x>"] stringValue]
 	    isEqual: @"foobarbazqux"])
 
 	TEST(@"-[elementsForName:namespace:]",
 	    (a = [elem[2] elementsForName: @"bar"
 				namespace: @"urn:objfw:test"]) &&