diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c573912e7..5bfb7637c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="biz.bokhorst.xprivacy"
     android:installLocation="internalOnly"
-    android:versionCode="479"
-    android:versionName="3.6.17" >
+    android:versionCode="480"
+    android:versionName="3.6.18" >
 
     <uses-sdk
         android:minSdkVersion="15"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02047fe24..f6d3f4c6c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,12 +20,16 @@ Changelog
 
 **Next release**
 
-* Fixed location restrictions in AOSP mode on Android Lollipop ([issue](/../../issues/2219))
+* ...
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 
 **Version 3.6.17 STABLE**
 
+* Fixed location restrictions in AOSP mode on Android Lollipop ([issue](/../../issues/2219))
+
+**Version 3.6.17 STABLE**
+
 * Fixed bootloop in some cases for Android versions before Lollipop ([issue](/../../issues/2209))
 
 **Version 3.6.16 BETA**
diff --git a/src/biz/bokhorst/xprivacy/PrivacyService.java b/src/biz/bokhorst/xprivacy/PrivacyService.java
index 26c767cf1..2ada29b3a 100644
--- a/src/biz/bokhorst/xprivacy/PrivacyService.java
+++ b/src/biz/bokhorst/xprivacy/PrivacyService.java
@@ -84,8 +84,8 @@ public class PrivacyService extends IPrivacyService.Stub {
 	private static final String cTableUsage = "usage";
 	private static final String cTableSetting = "setting";
 
-	private static final int cCurrentVersion = 479;
-	private static final String cServiceName = "xprivacy479";
+	private static final int cCurrentVersion = 480;
+	private static final String cServiceName = "xprivacy480";
 
 	private boolean mCorrupt = false;
 	private boolean mNotified = false;