diff --git a/build/build.xml b/build/build.xml
index f63967a1..97503dcf 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -110,6 +110,9 @@
             basedir="${build.classes}"
             includes="**/main/launcher/**"
             manifest="${build.src}/helma/main/launcher/manifest.txt"/>
+        <!-- Copy timestamped helma jar file to lib/helma.jar  -->
+        <copy file="${build.lib}/${jar.name}-${DSTAMP}.jar" 
+              tofile="${build.lib}/${jar.name}.jar"/>
     </target>
 
 
@@ -211,7 +214,7 @@
         <!-- copy all libraries except helma-YYYYMMDD.jar -->
         <copy todir="${build.work}/lib">
             <fileset dir="${home.dir}/lib">
-                <exclude name="**/helma*.jar" />
+                <exclude name="**/helma-*.jar" />
                 <include name="**/*.jar" />
             </fileset>
         </copy>
@@ -229,9 +232,6 @@
             <fileset dir="${home.dir}/scripts" excludes="**/CVS**"/>
         </copy>
 
-        <!-- rename the current jar-file -->
-        <copy file="${build.lib}/${jar.name}-${DSTAMP}.jar" tofile="${build.work}/lib/helma.jar"/>
-
         <!-- zip the sourcecode -->
         <!-- mkdir dir="${build.work}/src"/>
         <tar tarfile="${build.work}/src/helma-src.tar" basedir="${build.src}/">