diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a0dcb688..c64ac897b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(PROJECT_NAME_CAPITALIZED "Minetest")
 # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 16)
+set(VERSION_PATCH 17)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases
diff --git a/build/android/build.gradle b/build/android/build.gradle
index 1263b2232..f92fb3bbf 100644
--- a/build/android/build.gradle
+++ b/build/android/build.gradle
@@ -14,7 +14,7 @@ android {
 	buildToolsVersion "25.0.3"
 
 	defaultConfig {
-		versionCode 17
+		versionCode 18
 		versionName "${System.env.VERSION_STR}.${versionCode}"
 		minSdkVersion 9
 		targetSdkVersion 9
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index bb6491627..728fd0a1c 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Modding API Reference 0.4.16
+Minetest Lua Modding API Reference 0.4.17
 =========================================
 * More information at <http://www.minetest.net/>
 * Developer Wiki: <http://dev.minetest.net/>
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index 074bc962d..eb0d2ed6c 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 0.4.16
+Minetest Lua Mainmenu API Reference 0.4.17
 ========================================
 
 Introduction