diff --git a/build.xml b/build.xml
index 59198b81..a34a1b5e 100644
--- a/build.xml
+++ b/build.xml
@@ -110,7 +110,7 @@
             <header trimleading="yes">/*!
             ${license.text}
             */
-            /* Version v@VERSION@, Build time: ${RIGHT_NOW} */
+            /* Version v@VERSION@, Build time: @BUILD_TIME@ */
             var parserlib = {};
             (function(){
             </header>
@@ -136,7 +136,7 @@
             <header trimleading="yes">/*
             ${license.text}
             */
-            /* Version v@VERSION@, Build time: ${RIGHT_NOW} */
+            /* Version v@VERSION@, Build time: @BUILD_TIME@ */
             (function(){
             var EventTarget = parserlib.util.EventTarget,
 			    TokenStreamBase = parserlib.util.TokenStreamBase,
@@ -207,10 +207,13 @@
         <mkdir dir="${release.dir}"/>
         <copy todir="${release.dir}">
             <fileset dir="${build.dir}" includes="**/*" />
+			<filterchain>
+				<replacetokens>
+					<token key="VERSION" value="${parserlib.version}"/>
+					<token key="BUILD_TIME" value="${RIGHT_NOW}"/>
+				</replacetokens>
+			</filterchain>
         </copy>
-        <replaceregexp match="@VERSION@" replace="${parserlib.version}" flags="g" byline="true">
-            <fileset dir="${release.dir}" includes="**/*"/>
-        </replaceregexp>
     </target>
 
     <!-- Build all files -->
diff --git a/build/node-parserlib.js b/build/node-parserlib.js
index 5bbf8dab..38b3f384 100644
--- a/build/node-parserlib.js
+++ b/build/node-parserlib.js
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 var parserlib = {};
 (function(){
 
@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 (function(){
 var EventTarget = parserlib.util.EventTarget,
 TokenStreamBase = parserlib.util.TokenStreamBase,
diff --git a/build/npm/lib/node-parserlib.js b/build/npm/lib/node-parserlib.js
index 5bbf8dab..38b3f384 100644
--- a/build/npm/lib/node-parserlib.js
+++ b/build/npm/lib/node-parserlib.js
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 var parserlib = {};
 (function(){
 
@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 (function(){
 var EventTarget = parserlib.util.EventTarget,
 TokenStreamBase = parserlib.util.TokenStreamBase,
diff --git a/build/parserlib-core.js b/build/parserlib-core.js
index 88de2290..331009f3 100644
--- a/build/parserlib-core.js
+++ b/build/parserlib-core.js
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 var parserlib = {};
 (function(){
 
diff --git a/build/parserlib-css.js b/build/parserlib-css.js
index 7fa2916b..cf98b15a 100644
--- a/build/parserlib-css.js
+++ b/build/parserlib-css.js
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 (function(){
 var EventTarget = parserlib.util.EventTarget,
 TokenStreamBase = parserlib.util.TokenStreamBase,
diff --git a/build/parserlib.js b/build/parserlib.js
index 9018b3c0..cb90618d 100644
--- a/build/parserlib.js
+++ b/build/parserlib.js
@@ -21,7 +21,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 var parserlib = {};
 (function(){
 
@@ -931,7 +931,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 */
-/* Version v@VERSION@, Build time: 19-November-2012 10:07:25 */
+/* Version v@VERSION@, Build time: @BUILD_TIME@ */
 (function(){
 var EventTarget = parserlib.util.EventTarget,
 TokenStreamBase = parserlib.util.TokenStreamBase,