diff --git a/build.ant.properties b/build.ant.properties
index ef2fd22d2b..3ac738ffb6 100644
--- a/build.ant.properties
+++ b/build.ant.properties
@@ -73,7 +73,7 @@ version_server = http://arianne.sourceforge.net/stendhal.version
 
 # current version of stendhal
 version.old = 0.95
-version  = 0.95.5
+version  = 0.96
 
 # javac options
 javac.deprecation	= true
diff --git a/build.xml b/build.xml
index 8ec658f3dc..4a5369805c 100644
--- a/build.xml
+++ b/build.xml
@@ -786,7 +786,7 @@
 			<arg value="-creatediff" />
 			<arg value="-output" />
 			<arg value="${build}/lib/stendhal-diff-${version.old}-${version}.jar" />
-			<arg value="${build-archive}/stendhal-${version.old}.jar" />
+			<arg value="${build-archive}/lib/stendhal.jar" />
 			<arg value="${build}/lib/stendhal-${version}.jar" />
 		</java>
 		<java jar="libs/jardiff.jar" fork="true">
@@ -794,7 +794,7 @@
 			<arg value="-creatediff" />
 			<arg value="-output" />
 			<arg value="${build}/lib/stendhal-data-diff-${version.old}-${version}.jar" />
-			<arg value="${build-archive}/lib/stendhal-data-${version.old}.jar" />
+			<arg value="${build-archive}/lib/stendhal-data.jar" />
 			<arg value="${build}/lib/stendhal-data-${version}.jar" />
 		</java>
 		<java jar="libs/jardiff.jar" fork="true">
@@ -802,7 +802,7 @@
 			<arg value="-creatediff" />
 			<arg value="-output" />
 			<arg value="${build}/lib/stendhal-music-data-diff-${version.old}-${version}.jar" />
-			<arg value="${build-archive}/lib/stendhal-music-data-${version.old}.jar" />
+			<arg value="${build-archive}/lib/stendhal-music-data.jar" />
 			<arg value="${build}/lib/stendhal-music-data-${version}.jar" />
 		</java>
 		<java jar="libs/jardiff.jar" fork="true">
@@ -810,7 +810,7 @@
 			<arg value="-creatediff" />
 			<arg value="-output" />
 			<arg value="${build}/lib/stendhal-sound-data-diff-${version.old}-${version}.jar" />
-			<arg value="${build-archive}/lib/stendhal-sound-data-${version.old}.jar" />
+			<arg value="${build-archive}/lib/stendhal-sound-data.jar" />
 			<arg value="${build}/lib/stendhal-sound-data-${version}.jar" />
 		</java>
 	<!-- TODO maraurora.jar-->
diff --git a/runserver.bat b/runserver.bat
index c2891a1fa6..b17fecb325 100644
--- a/runserver.bat
+++ b/runserver.bat
@@ -1,3 +1,3 @@
-set STENDHAL_VERSION=0.95.5
+set STENDHAL_VERSION=0.96
 set LOCALCLASSPATH=.;data\script;data\conf;stendhal-server-%STENDHAL_VERSION%.jar;marauroa.jar;mysql-connector.jar;log4j.jar;commons-lang.jar;h2.jar
 java -Xmx400m -cp "%LOCALCLASSPATH%" games.stendhal.server.StendhalServer -c server.ini -l
diff --git a/runserver.sh b/runserver.sh
index e98d328677..ef9fbafd7d 100644
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-STENDHAL_VERSION="0.95.5"
+STENDHAL_VERSION="0.96"
 
 LOCALCLASSPATH=.:data/script/:data/conf/:stendhal-server-$STENDHAL_VERSION.jar:marauroa.jar:mysql-connector.jar:log4j.jar:commons-lang.jar:h2.jar
 
diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java
index c3d58b6d6b..f326056d9a 100644
--- a/src/games/stendhal/common/Debug.java
+++ b/src/games/stendhal/common/Debug.java
@@ -26,7 +26,7 @@ public class Debug {
 
 	/** version. */
 	// Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line.
-	public static final String VERSION = "0.95.5";
+	public static final String VERSION = "0.96";
 
 	public static final String PRE_RELEASE_VERSION = null;
 
diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java
index 2e225272a9..6d4a78f9e6 100644
--- a/src/games/stendhal/server/core/engine/GenerateINI.java
+++ b/src/games/stendhal/server/core/engine/GenerateINI.java
@@ -271,7 +271,7 @@ public class GenerateINI {
 		out.println();
 		out.println("server_typeGame=" + gameName);
 		out.println("server_name=" + gameName + " Marauroa server");
-		out.println("server_version=0.95.5");
+		out.println("server_version=0.96");
 		out.println("server_contact=https://sourceforge.net/tracker/?atid=514826&group_id=66537&func=browse");
 		out.println();
 		out.println("# Extensions configured on the server. Enable at will.");
diff --git a/stendhal.jnlp b/stendhal.jnlp
index fa609f396e..27ba7148df 100644
--- a/stendhal.jnlp
+++ b/stendhal.jnlp
@@ -22,7 +22,7 @@ Some of these people are NPC, they will give you tasks to accomplish and hints t
   </security>
   <resources>
     <j2se href="http://java.sun.com/products/autodl/j2se" version="1.5+" /> <!--  max-heap-size="120" -->
-    <jar href="http://arianne.sourceforge.net/jws/stendhal-starter-0.95.5.jar" download="eager" main="true" />
+    <jar href="http://arianne.sourceforge.net/jws/stendhal-starter-0.96.jar" download="eager" main="true" />
   </resources>
   <application-desc/>
 </jnlp>