diff --git a/build.xml b/build.xml
index 859642b..b630837 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,8 @@
 
 <project name="Sun Games Initiative Client Technologies" basedir="." default="all" xmlns:artifact="urn:maven-artifact-ant">
 	
-	<property name="mvn.version" value="2.0.4"/>
+	<property name="api.version" value="2.0.5"/>
+	<property name="mvn.version" value="${api.version}-SNAPSHOT"/>
 	<property name="maven-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
 	<property name="maven-repository-id" value="sonatype-nexus-staging" />
 	
@@ -72,6 +73,7 @@
 		<attribute name="target"/>
 		<sequential>
 			<subant target="@{target}">
+				<property name="api.version" value="${api.version}"/>
 				<fileset file="coreAPI/build.xml"/>
 				<fileset file="plugins/linux/build.xml"/>
 				<fileset file="plugins/windows/build.xml"/>
diff --git a/coreAPI/build.xml b/coreAPI/build.xml
index d0ecade..f585b00 100644
--- a/coreAPI/build.xml
+++ b/coreAPI/build.xml
@@ -23,11 +23,13 @@
     		 todir="build/src/java/net/java/games/input/" overwrite="true">
 			<filterset>
 				<filter token="BUILD_NUMBER" value="${build.number}"/>
+				<filter token="API_VERSION" value="${api.version}"/>
 			</filterset>
 		</copy>
 		<javac srcdir="build/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
 			<include name="net/**" />
 		</javac>
+    	<echo message="Build version class for ${api.version} build ${build.number}"/>
     </target>
 
     <target name="jar" depends="init,compile">
diff --git a/coreAPI/src/java/net/java/games/input/Version.java b/coreAPI/src/java/net/java/games/input/Version.java
index 06491d1..1aac468 100644
--- a/coreAPI/src/java/net/java/games/input/Version.java
+++ b/coreAPI/src/java/net/java/games/input/Version.java
@@ -89,13 +89,14 @@ public final class Version {
   /**
    * Version string of this build.
    */
-  private static final String apiVersion = "2.0.1";
+  private static final String apiVersion = "@API_VERSION@";
   private static final String buildNumber = "@BUILD_NUMBER@";
 
   /*
    * Split so that ant does not replace the token;
    */
-  private static final String antToken = "@BUILD_" + "NUMBER@";
+  private static final String antBuildNumberToken = "@BUILD_" + "NUMBER@";
+  private static final String antAPIVersionToken = "@API_" + "VERSION@";
   
   /**
    * Returns the verison string and build number of
@@ -105,8 +106,11 @@ public final class Version {
    * @return The version string of this implementation.
    */
   public static String getVersion() {
-	String version = apiVersion;
-	if(!antToken.equals(buildNumber)) {
+	String version = "Unversioned";
+	if(!antAPIVersionToken.equals(apiVersion)) {
+		version = apiVersion;
+	}
+	if(!antBuildNumberToken.equals(buildNumber)) {
 		version += "-b" + buildNumber;
 	}
     return version;