diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ae25628..c1074e6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ project(minetest)
 
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 2)
-set(VERSION_PATCH 20110529_3_dev)
+set(VERSION_PATCH 20110602_0)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 # Configuration options
diff --git a/doc/changelog.txt b/doc/changelog.txt
index e0201978..5a01b6bc 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -3,6 +3,11 @@ Minetest-c55 changelog
 This should contain all the major changes.
 For minor stuff, refer to the commit log of the repository.
 
+2011-06-02:
+- Password crash on windows fixed
+- Optimized server CPU usage a lot
+- Furnaces now work also while players are not near to them
+
 2011-05-29:
 - Optimized smooth lighting
 - A number of small fixes
diff --git a/src/main.cpp b/src/main.cpp
index 958f812b..2cde3b30 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -312,9 +312,6 @@ Stuff to do before release:
 
 Fixes to the current release:
 -----------------------------
-- Fix client password crash
-- Remember to release the fixes (some are already done)
-- A command to set one's password when the server is running
 
 Stuff to do after release:
 ---------------------------