Index: applications/editors/josm/plugins/ywms/build.xml
===================================================================
--- applications/editors/josm/plugins/ywms/build.xml	(revision 4017)
+++ applications/editors/josm/plugins/ywms/build.xml	(revision 4018)
@@ -23,15 +23,18 @@
 			<fileset dir="images"/>
 		</copy>
-		<exec append="false" output="build/resources/REVISION" executable="svn" failifexecutionfails="false">
+		<exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
 			<env key="LANG" value="C"/>
 			<arg value="info"/>
+			<arg value="--xml"/>
 			<arg value="."/>
 		</exec>
-		<property file="build/resources/REVISION" />
+		<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
+		<delete file="REVISION"/>
 		<jar destfile="ywms.jar" basedir="build">
 			<manifest>
 				<attribute name="Plugin-Class" value="org.openstreetmap.josm.plugins.ywms.YWMSPlugin"/>
 				<attribute name="Plugin-Description" value="A WMS server for Yahoo imagery based on Firefox"/>
-				<attribute name="Plugin-Version" value="${Revision}"/>
+				<attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+				<attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
 				<attribute name="Author" value="Francisco R. Santos &lt;frsantos@gmail.com>"/>
 			</manifest>
Index: applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/Util.java
===================================================================
--- applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/Util.java	(revision 4017)
+++ applications/editors/josm/plugins/ywms/src/org/openstreetmap/josm/plugins/ywms/Util.java	(revision 4018)
@@ -8,12 +8,9 @@
 import java.net.URLConnection;
 import java.util.StringTokenizer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import javax.swing.JButton;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.plugins.Plugin;
-import org.openstreetmap.josm.plugins.PluginProxy;
+import org.openstreetmap.josm.plugins.*;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -81,23 +78,9 @@
 	public static Version getVersion()
     {
-    	String revision;
-    	try 
-    	{
-			revision = loadFile(Util.class.getResource("/resources/REVISION"));
-		} 
-    	catch (Exception e) 
-    	{
-			return null;
-		}
-
-		Pattern versionPattern = Pattern.compile(".*?Revision: ([0-9]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-		Matcher match = versionPattern.matcher(revision);
-		String version = match.matches() ? match.group(1) : "UNKNOWN";
-
-		Pattern timePattern = Pattern.compile(".*?Last Changed Date: ([^\n]*).*", Pattern.CASE_INSENSITIVE|Pattern.DOTALL);
-		match = timePattern.matcher(revision);
-		String time = match.matches() ? match.group(1) : "UNKNOWN";
-		
-		return new Version(version, time);
+        PluginInformation info = PluginInformation.getLoaded("ywms");
+        if( info == null )
+            return null;
+
+        return new Version(info.version, info.attr.get("Plugin-Date"));
     }