diff --git a/CHANGELOG b/CHANGELOG
index 9ba29e66593e06e9602eb6ae482a50d93becbc52..6115133afd664150118923fe124daee2f48037ae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+0.8.0 November 25 2014 - the "problematic" release
+Features:
+- Block connection until VPN is established
+- Start VPN automatically after logging in
+- Lollipop support
+- Update ndk and ics-openvpn codebase
+Bugs:
+- Pin provider certificate with configuration data
+- Autoupdate vpn certificate correctly
+
 0.7.0 September 26 2014 - the "quick" release
 Features
 - Restart quickly if killed
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 271b6631483703e98411e827e2536daa0c2aa91a..d5081b8d836fe3d2087b87264f6aa23c4f8aa361 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="se.leap.bitmaskclient"
-    android:versionCode="100"
+    android:versionCode="102"
     android:versionName="0.8.0" >
 
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index 24aa17bd1cf7a48bff7b1b8db7a595a46081d5c5..364a79af3b618e0d83c2601e2dd1ac19bcc954f6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -112,7 +112,7 @@ public class Dashboard extends Activity implements LogInDialog.LogInDialogInterf
 
 	    switch(versionCode) {
 	    case 91: // 0.6.0 without Bug #5999
-	    case 95: // 0.8.0 RC2
+	    case 101: // 0.8.0
 		if(!preferences.getString(EIP.KEY, "").isEmpty()) {
 		    Intent rebuildVpnProfiles = new Intent(getApplicationContext(), EIP.class);
 		    rebuildVpnProfiles.setAction(EIP.ACTION_REBUILD_PROFILES);
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 2ce3c20fd114b389bafbaeb28fda182b2ad95822..2f06def3f84e751f5c5180b9c1e863c2e431d1ce 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -150,13 +150,13 @@ public final class EIP extends IntentService {
      * It also sets up early routes.
      */
     private void startEIP() {
+        earlyRoutes();
 	activeGateway = selectGateway();
 	    
 	if(activeGateway != null && activeGateway.mVpnProfile != null) {
 	    mReceiver = EipServiceFragment.getReceiver();
 	    launchActiveGateway();
 	}
-        //earlyRoutes();
     }
 
     /**