diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 25b78bd6a1f1cc97489cbc44bdd72ed78703ac1a..815ddf878742aa1d7ec1e36a5004298b93ea0bb5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="64"
-    android:versionName="0.2.3" >
+    android:versionCode="67"
+    android:versionName="0.4" >
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/CHANGELOG b/CHANGELOG
index b0f0d8e0d907830692bf4c5315407a4f69e72c9b..7b635a06d4fa173aaa0fce03120f10d877c78876 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,18 @@
-0.2.3-rc1 Nov 29 2013
+0.4 Feb 10 2014
+Features
+- Use token based authentication
+- UI Improvements
+- Show location of VPN gateway
+- About view is now an Activity
+- Removed ics-openvpn references and unused code
+Bugs Fixed
+- Improved handling of Configuration Wizard errors
+- Use strong cert pinning for provider
+- Progress bars layout
+- References to "LEAP Android" changed to Bitmask
+- Login/logout messages clear when complete
+
+0.2.3 Nov 29 2013
 Features
 - Begin integrating tests into repository
 - Clearer wording in some places