diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4c050842..8d61cf1c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 # Also remember to set PROTOCOL_VERSION in clientserver.h when releasing
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH dev-20120606)
+set(VERSION_PATCH 0)
 if(VERSION_EXTRA)
 	set(VERSION_PATCH ${VERSION_PATCH}-${VERSION_EXTRA})
 endif()
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 16f10815c..0f91d3894 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -1,4 +1,4 @@
-Minetest Lua Modding API Reference 0.4.dev
+Minetest Lua Modding API Reference 0.4.0
 ==========================================
 More information at http://c55.me/minetest/
 
diff --git a/doc/mapformat.txt b/doc/mapformat.txt
index ce00d276e..ef16118c5 100644
--- a/doc/mapformat.txt
+++ b/doc/mapformat.txt
@@ -3,7 +3,9 @@ Minetest World Format 22...23
 =============================
 
 This applies to a world format carrying the block serialization version
-22...23, used at least in 0.4.dev-20120322 ... 0.4.dev-20120606.
+22...23, used at least in
+- 0.4.dev-20120322 ... 0.4.dev-20120606
+- 0.4.0.
 
 The block serialization version does not fully specify every aspect of this
 format; if compliance with this format is to be checked, it needs to be