diff --git a/build.xml b/build.xml
index 87e664c04..683d83a04 100644
--- a/build.xml
+++ b/build.xml
@@ -214,6 +214,15 @@
   -->
   <target name="compile" depends="prepare">
 
+    <javac srcdir="${build.src}"
+           destdir="${build.classes}"
+           debug="${debug}"
+           deprecation="${deprecation}"
+           optimize="${optimize}" >
+      <classpath refid="classpath" />
+      <include name="${constants.file}" />
+    </javac>
+
     <javac srcdir="${java.dir}"
            destdir="${build.classes}"
            debug="${debug}"
@@ -250,10 +259,10 @@
       <exclude name="${optional.package}/sound/*.java" unless="jmf.present" />
     </javac>
 
-    <copy file="${build.src}/${ant.package}/defaultManifest.mf"
+    <copy file="${java.dir}/${ant.package}/defaultManifest.mf"
           todir="${build.classes}/${ant.package}" />
           
-    <copy file="${build.src}/${ant.package}/taskdefs/defaults.properties"
+    <copy file="${java.dir}/${ant.package}/taskdefs/defaults.properties"
           todir="${build.classes}/${ant.package}/taskdefs" />
 
   </target>
diff --git a/src/main/org/apache/tools/ant/Constants.java b/src/main/org/apache/tools/ant/Constants.java
index 8a50dc4c8..9a485a435 100644
--- a/src/main/org/apache/tools/ant/Constants.java
+++ b/src/main/org/apache/tools/ant/Constants.java
@@ -14,6 +14,6 @@ package org.apache.tools.ant;
  */
 interface Constants
 {
-    String  DATE     = "@@DATE@@";
-    String  VERSION  = "@@VERSION@@";
+    String  DATE     = "@DATE@";
+    String  VERSION  = "@VERSION@";
 }