diff --git a/build.ant.properties b/build.ant.properties
index 705308a864..ed4c7b784a 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.84
-version  = 0.84.5
+version  = 0.85
 
 # javac options
 javac.deprecation	= true
diff --git a/runserver.bat b/runserver.bat
index 9476a84ce2..d5496613d0 100644
--- a/runserver.bat
+++ b/runserver.bat
@@ -1,3 +1,3 @@
-set STENDHAL_VERSION=0.84.5
+set STENDHAL_VERSION=0.85
 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%" marauroa.server.marauroad -c server.ini -l
diff --git a/runserver.sh b/runserver.sh
index 79be2b8de3..1a422d3540 100644
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-STENDHAL_VERSION="0.84.5"
+STENDHAL_VERSION="0.85"
 
 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/client/update/Version.java b/src/games/stendhal/client/update/Version.java
index a764893537..e341a5108c 100644
--- a/src/games/stendhal/client/update/Version.java
+++ b/src/games/stendhal/client/update/Version.java
@@ -10,7 +10,7 @@ package games.stendhal.client.update;
 public class Version {
 
 	/** Version Number. */
-	public static final String VERSION = "0.84.5";
+	public static final String VERSION = "0.85";
 
 	/**
 	 * Extract the specified number of parts from a version-string.
diff --git a/src/games/stendhal/common/Debug.java b/src/games/stendhal/common/Debug.java
index ef80b65fd0..315b83bb39 100644
--- a/src/games/stendhal/common/Debug.java
+++ b/src/games/stendhal/common/Debug.java
@@ -25,7 +25,7 @@ public interface Debug {
 
 	/** server version. */
 	// Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line.
-	String VERSION = "0.84.5";
+	String VERSION = "0.85";
 
 	
 	/**
diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java
index 7bc171ada5..6ea5b8db55 100644
--- a/src/games/stendhal/server/core/engine/GenerateINI.java
+++ b/src/games/stendhal/server/core/engine/GenerateINI.java
@@ -234,7 +234,7 @@ public class GenerateINI {
 		out.println();
 		out.println("server_typeGame=" + gameName);
 		out.println("server_name=" + gameName + " Marauroa server");
-		out.println("server_version=0.84.5");
+		out.println("server_version=0.85");
 		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 baa9757f35..63f543a6eb 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.84.5.jar" download="eager" main="true" />
+    <jar href="http://arianne.sourceforge.net/jws/stendhal-starter-0.85.jar" download="eager" main="true" />
   </resources>
   <application-desc/>
 </jnlp>