diff --git a/build.xml b/build.xml
index c03a3a03f..00c884965 100644
--- a/build.xml
+++ b/build.xml
@@ -693,6 +693,7 @@
       <fileset dir="${java.dir}">
         <include name="**/*.properties"/>
         <include name="**/*.dtd"/>
+        <include name="**/*.xml"/>
       </fileset>
       <fileset dir="${resource.dir}" />
     </copy>
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/antlib.xml b/src/main/org/apache/tools/ant/taskdefs/condition/antlib.xml
index 5c163e4d0..aa67b75fb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/antlib.xml
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/antlib.xml
@@ -20,7 +20,7 @@
 
   -->
   <!-- ant1.6+ antlib declaration for the conditions
-  use with the declaration xmlns:cond="antlib:org.apache.tools.ant.conditions" to
+  use with the declaration xmlns:cond="antlib:org.apache.tools.ant.condition" to
   trigger ant's autoload of this file into a namespace.
 
   Please keep this list in alphabetical order -it is easier to verify that way