diff --git a/build.xml b/build.xml
index d18a257b7..f0c68db80 100644
--- a/build.xml
+++ b/build.xml
@@ -534,9 +534,11 @@
                     <contains value="public final static String VERSION"/>
                 </linecontains>
                 <tokenfilter>
-                    <replaceregex pattern='.*"([^"]+)";' replace="\1" flags="gi" />
+                    <replaceregex pattern=".*&quot;(.*)&quot;;" replace="\1" flags="gi" />
                 </tokenfilter>
+                <striplinebreaks/>
                 <trim/>
+                <ignoreblank/>
             </filterchain>
         </loadfile>
         <property name="release.number" value="unknown" />
@@ -552,7 +554,9 @@
                 <tokenfilter>
                     <replaceregex pattern=".*=\s+([0-9]+);" replace="\1" flags="gi" />
                 </tokenfilter>
+                <striplinebreaks/>
                 <trim/>
+                <ignoreblank/>
             </filterchain>
         </loadfile>
         <loadfile srcfile="router/java/src/net/i2p/router/RouterVersion.java" property="build.extra">
@@ -561,8 +565,10 @@
                     <contains value="public final static String EXTRA" />
                 </linecontains>
                 <tokenfilter>
-                    <replaceregex pattern='.*"(.*)";' replace="\1" flags="gi" />
+                    <replaceregex pattern=".*&quot;(.*)&quot;;" replace="\1" flags="gi" />
                 </tokenfilter>
+                <striplinebreaks/>
+                <ignoreblank/>
                 <trim/>
             </filterchain>
         </loadfile>