Index: C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/DomReader.java
===================================================================
--- C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/DomReader.java	(revision 639)
+++ C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/DomReader.java	(working copy)
@@ -28,7 +28,8 @@
     }
 
     public String getNodeName() {
-        return currentElement.getTagName();
+        String localName = currentElement.getLocalName();
+		return localName == null ? currentElement.getNodeName() : localName;
     }
 
     public String getValue() {
Index: C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java
===================================================================
--- C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java	(revision 639)
+++ C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/xppdom/Xpp3DomBuilder.java	(working copy)
@@ -17,6 +17,7 @@
         Xpp3Dom node = null;
 
         XmlPullParser parser = new MXParser();
+        parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES,true);
 
         parser.setInput(reader);
 
Index: C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/XppReader.java
===================================================================
--- C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/XppReader.java	(revision 639)
+++ C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/XppReader.java	(working copy)
@@ -35,7 +35,13 @@
      * To use another implementation of org.xmlpull.v1.XmlPullParser, override this method.
      */
     protected XmlPullParser createParser() {
-        return new MXParser();
+        MXParser p = new MXParser();
+        try {
+			p.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES,true);
+		} catch (XmlPullParserException e) {
+			e.printStackTrace();
+		}
+		return p;
     }
 
     protected int pullNextEvent() {
Index: C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java
===================================================================
--- C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java	(revision 639)
+++ C:/Documents and Settings/Maarten Winkels/workspace/xstream/src/java/com/thoughtworks/xstream/io/xml/DomDriver.java	(working copy)
@@ -18,6 +18,7 @@
 
     public DomDriver(String encoding) {
         documentBuilderFactory = DocumentBuilderFactory.newInstance();
+        documentBuilderFactory.setNamespaceAware(true);
         this.encoding = encoding;
     }
 
Index: C:/Documents and Settings/Maarten Winkels/workspace/xstream/build.xml
===================================================================
--- C:/Documents and Settings/Maarten Winkels/workspace/xstream/build.xml	(revision 639)
+++ C:/Documents and Settings/Maarten Winkels/workspace/xstream/build.xml	(working copy)
@@ -64,6 +64,12 @@
             <excludesfile name="jdk-1.4-specific.txt" unless="jdk1.4.available" />
             <classpath refid="classpath"/>
         </javac>
+    	<copy todir="${test.build.dir}">
+    		<fileset dir="src/test">
+    			<include name="**/*.xml"/>
+    			<include name="**/*.xsd"/>
+    		</fileset>
+   		</copy>
     </target>
 
     <target name="test" depends="test:compile" description="Run all acceptance tests and unit tests">