diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6f8cb2730..f5e374bde 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fdroid.fdroid"
     android:installLocation="auto"
-    android:versionCode="570"
-    android:versionName="0.57-test" >
+    android:versionCode="580"
+    android:versionName="0.58" >
 
     <uses-sdk
         android:minSdkVersion="5"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c78474d2..1176143f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### Upcoming release
+### 0.58 (2014-01-11)
 
 * Download icons with a resolution that matches the device's screen density,
   which saves resources on smaller devices and gets rid of unnecessary
diff --git a/res/values/no_trans.xml b/res/values/no_trans.xml
index d7c222ee0..93dca0a40 100644
--- a/res/values/no_trans.xml
+++ b/res/values/no_trans.xml
@@ -2,7 +2,7 @@
 <resources>
 
 	<string name="app_name">F-Droid</string>
-	<string name="version_name">0.57-test</string>
+	<string name="version_name">0.58</string>
 
 	<string name="about_sitec">https://f-droid.org</string>
 	<string name="about_mailc">team@f-droid.org</string>