diff --git a/CMakeLists.txt b/CMakeLists.txt
index 539169b20..0ab60111c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,12 @@ set(CLANG_MINIMUM_VERSION "3.5")
# You should not need to edit these manually, use util/bump_version.sh
set(VERSION_MAJOR 5)
-set(VERSION_MINOR 7)
+set(VERSION_MINOR 8)
set(VERSION_PATCH 0)
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Change to false for releases
-set(DEVELOPMENT_BUILD FALSE)
+set(DEVELOPMENT_BUILD TRUE)
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
if(VERSION_EXTRA)
diff --git a/android/build.gradle b/android/build.gradle
index b1c170c78..27bf1ba11 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,11 +1,11 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
project.ext.set("versionMajor", 5) // Version Major
-project.ext.set("versionMinor", 7) // Version Minor
+project.ext.set("versionMinor", 8) // Version Minor
project.ext.set("versionPatch", 0) // Version Patch
-project.ext.set("versionExtra", "") // Version Extra
+project.ext.set("versionExtra", "-dev") // Version Extra
project.ext.set("versionCode", 44) // Android Version Code
-project.ext.set("developmentBuild", 0) // Whether it is a development build, or a release
+project.ext.set("developmentBuild", 1) // Whether it is a development build, or a release
// NOTE: +2 after each release!
// +1 for ARM and +1 for ARM64 APK's, because
// each APK must have a larger `versionCode` than the previous
diff --git a/doc/client_lua_api.txt b/doc/client_lua_api.txt
index 252f20fb2..53d8867d3 100644
--- a/doc/client_lua_api.txt
+++ b/doc/client_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Client Modding API Reference 5.7.0
+Minetest Lua Client Modding API Reference 5.8.0
================================================
* More information at
* Developer Wiki:
diff --git a/doc/menu_lua_api.txt b/doc/menu_lua_api.txt
index e8d7b6e40..d65e9c83f 100644
--- a/doc/menu_lua_api.txt
+++ b/doc/menu_lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Mainmenu API Reference 5.7.0
+Minetest Lua Mainmenu API Reference 5.8.0
=========================================
Introduction