diff --git a/build.ant.properties b/build.ant.properties
index 2eba6c5902..46543b69ea 100644
--- a/build.ant.properties
+++ b/build.ant.properties
@@ -82,8 +82,8 @@ updates_server_fallback = http://arianne.sourceforge.net/stendhal/updates
 version_server = http://arianne.sourceforge.net/stendhal.version
 
 # current version of stendhal
-version.old = 1.39
-version  = 1.39.5
+version.old = 1.40
+version  = 1.40.5
 
 # javac options
 javac.deprecation	= true
diff --git a/buildtools/doxygen/Doxyfile b/buildtools/doxygen/Doxyfile
index 21e6a58126..ddd0af9e66 100644
--- a/buildtools/doxygen/Doxyfile
+++ b/buildtools/doxygen/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = Stendhal
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.39.5
+PROJECT_NUMBER         = 1.40.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/runserver.bat b/runserver.bat
index 84311f4d10..f9fc60e0e1 100644
--- a/runserver.bat
+++ b/runserver.bat
@@ -1,4 +1,4 @@
-set STENDHAL_VERSION=1.39.5
+set STENDHAL_VERSION=1.40.5
 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
 @pause
\ No newline at end of file
diff --git a/runserver.sh b/runserver.sh
index 47e9e23502..fd9e65996e 100644
--- a/runserver.sh
+++ b/runserver.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-STENDHAL_VERSION="1.39.5"
+STENDHAL_VERSION="1.40.5"
 
 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 9770d4a0a9..1298766f27 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 = "1.39.5";
+	public static final String VERSION = "1.40.5";
 
 	/** pre release suffix */
 	// Note: This line is updated by build.xml using a regexp so be sure to adjust it in case you modify this line.
diff --git a/src/games/stendhal/server/core/engine/GenerateINI.java b/src/games/stendhal/server/core/engine/GenerateINI.java
index 9e1f25a486..e127c31fd2 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=1.39.5");
+		out.println("server_version=1.40.5");
 		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.");