diff --git a/build-spring-ldap/build-continuous.xml b/build-spring-ldap/build-continuous.xml
index c0a7515c..08fa8303 100644
--- a/build-spring-ldap/build-continuous.xml
+++ b/build-spring-ldap/build-continuous.xml
@@ -33,14 +33,14 @@
         <delete quiet="true" dir="${upload.tmp.dir}"/>
         <mkdir dir="${upload.tmp.dir}"/>
         <tstamp>
-            <format property="tstamp" pattern="yyyyMMdd-HHmm"/>
+            <format property="tstamp" pattern="yyyy-MM-dd"/>
         </tstamp>
         <move file="${target.release.dir}/${release.bin.zip}"
-            tofile="${upload.tmp.dir}/spring-ldap-bin-${release.version}-${tstamp}.zip"/>
+            tofile="${upload.tmp.dir}/spring-ldap-bin-${release.version}-${tstamp}-${build.version}.zip"/>
         <move file="${target.release.dir}/${release.bin.deps.zip}"
-            tofile="${upload.tmp.dir}/spring-ldap-bin-with-dependencies-${release.version}-${tstamp}.zip"/>
+            tofile="${upload.tmp.dir}/spring-ldap-bin-with-dependencies-${release.version}-${tstamp}-${build.version}.zip"/>
         <move file="${target.release.dir}/${release.buildable.zip}"
-            tofile="${upload.tmp.dir}/spring-ldap-buildable-${release.version}-${tstamp}.zip"/>
+            tofile="${upload.tmp.dir}/spring-ldap-buildable-${release.version}-${tstamp}-${build.version}.zip"/>
     </target>
     
     <target name="upload" depends="upload-binaries"/>
diff --git a/build-spring-ldap/build.xml b/build-spring-ldap/build.xml
index 298f363b..6cbd635b 100644
--- a/build-spring-ldap/build.xml
+++ b/build-spring-ldap/build.xml
@@ -85,14 +85,14 @@
     </ivy:buildlist>
 
     <tstamp>
-    	<format property="build.timestamp" pattern="yyyyMMddHHmmss"/>
+    	<format property="internal.build.timestamp" pattern="yyyyMMddHHmmss"/>
     </tstamp>
     <tstamp>
       <format property="TSTAMPCOL" pattern="hh:mm"/>
     </tstamp>
 
   	<!-- default the release version (used in release archive zips) to the current timestamp -->
-    <property name="release.version" value="${build.timestamp}"/>
+    <property name="release.version" value="${internal.build.timestamp}"/>
 
     <!-- root of build hierarchy -->
     <property name="target.dir" value="${basedir}/target"/>
diff --git a/common-build/common-targets.xml b/common-build/common-targets.xml
index 7fa01fec..8cb0a40a 100644
--- a/common-build/common-targets.xml
+++ b/common-build/common-targets.xml
@@ -63,14 +63,14 @@
 
   <target name="init.pre">
 
-    <!-- we default project.version to be ${project.base.version}-${build.timestamp}
+    <!-- we default project.version to be ${project.base.version}-${internal.build.timestamp}
        where project.base.version defaults to 1.0-dev.
        
        An importing project or master build should override project.base.version.
        For a release build which doesn't need the build timestamp, should override
        project.version itself to just be equal to ${project.base.version} -->
     <tstamp>
-      <format property="build.timestamp" pattern="yyyyMMddHHmmss" />
+      <format property="internal.build.timestamp" pattern="yyyyMMddHHmmss" />
     </tstamp>
     <tstamp>
       <format property="TSTAMPCOL" pattern="hh:mm" />
@@ -84,7 +84,7 @@
     <property name="project.webapp.name" value="${ant.project.name}" />
   	<property name="project.title" value="${project.name}" />
    	<property name="project.base.version" value="1.0-dev" />
-    <property name="project.version" value="${project.base.version}-${build.timestamp}" />
+    <property name="project.version" value="${project.base.version}-${internal.build.timestamp}" />
 	<property name="project.copyright" value="Copyright &#169; 2002-2006. All Rights Reserved."/>
   	
     <property environment="myenv" />