diff --git a/CHANGES.md b/CHANGES.md
index c074ee36..aec9077b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,37 @@
 # ThirtyInch Releases
 
+
+## Version 0.8.5 `12.10.17`
+
+### Summary
+
+Mostly a maintenance release improving documentation, adding tests and cleaning up the repository.
+
+Highlight: The `test` package is now deprecated and all functionality was moved into the `thirtyinch` artifact.
+
+Thanks for external contributors:
+@baltuky @vpondala 
+
+### Public changes
+
+- [Pull 115](https://github.com/grandcentrix/ThirtyInch/pull/115) New: Update dependencies (support lib 26.0.0, target- and compileSdkVersion 26 and other minor updates)
+- [Pull 120](https://github.com/grandcentrix/ThirtyInch/pull/120) New: `TiPresenter#test()` returns a `TiTestPresenter` with helper methods for unit testing. Replaces `TiPresenterInstructor` and deprecates the `test` artifact.
+- [Pull 126](https://github.com/grandcentrix/ThirtyInch/pull/126) Fix: `TiPresenter#test()` documentation, thx @baltuky
+
+### Internal changes
+
+- [Pull 99](https://github.com/grandcentrix/ThirtyInch/pull/99) Fix: remove javadoc warnings
+- [Pull 103](https://github.com/grandcentrix/ThirtyInch/pull/103) New: Improved `RELEASE.md` instructions
+- [Pull 105](https://github.com/grandcentrix/ThirtyInch/pull/105) New: Deprecate internal `DelegatedTiActivity#isActivityChangingConfigurations` which turned out as not required to handle config changes correctly. Simplifies internal logic
+- [Pull 112](https://github.com/grandcentrix/ThirtyInch/pull/112) New: Update to gradlew 4.1 allowing development with Android Studio 3.0
+- [Pull 113](https://github.com/grandcentrix/ThirtyInch/pull/113) New: Test for LifecycleObserver cleanup
+- [Pull 114](https://github.com/grandcentrix/ThirtyInch/pull/114) New: Tests for internal `OneTimeRemovable`
+- [Pull 117](https://github.com/grandcentrix/ThirtyInch/pull/117) New: internal `PresenterScope` tests
+- [Pull 121](https://github.com/grandcentrix/ThirtyInch/pull/121) New: Replace all `Hamcrest` assertions with `AssertJ`, thx @vpondala 
+- [Pull 123](https://github.com/grandcentrix/ThirtyInch/pull/123) New: Add codestyle to project and reformat all sources according to this. Reduces diffs for external contributors
+- [Pull 127](https://github.com/grandcentrix/ThirtyInch/pull/127) New: Additional tests for 
+`TiTestPresenter`
+
 ## Version 0.8.0 `04.05.17`
 
 ### Summary
diff --git a/build.gradle b/build.gradle
index 3b3dd0db..816fb652 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,8 +22,8 @@ allprojects {
 }
 
 ext {
-    VERSION_NAME = "0.8.1-SNAPSHOT"
-    VERSION_CODE = 6
+    VERSION_NAME = "0.8.5"
+    VERSION_CODE = 7
     MIN_SDK_VERSION = 14
     // If you change the SDK version don't forgot to update .travis.yml
     TARGET_SDK_VERSION = 26
diff --git a/logginginterceptor/build.gradle b/logginginterceptor/build.gradle
index 46ffaeb4..67ba425b 100644
--- a/logginginterceptor/build.gradle
+++ b/logginginterceptor/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 }
 
 publish {
-    userOrg = 'passsy'
+    userOrg = 'grandcentrix'
     groupId = 'net.grandcentrix.thirtyinch'
     artifactId = 'thirtyinch-logginginterceptor'
     uploadName = 'ThirtyInch'
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 7b6efc88..c0b84c31 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -42,7 +42,7 @@ dependencies {
 }
 
 publish {
-    userOrg = 'passsy'
+    userOrg = 'grandcentrix'
     groupId = 'net.grandcentrix.thirtyinch'
     artifactId = 'thirtyinch-plugin'
     uploadName = 'ThirtyInch'
diff --git a/rx/build.gradle b/rx/build.gradle
index 74a6ccb8..131b028d 100644
--- a/rx/build.gradle
+++ b/rx/build.gradle
@@ -47,7 +47,7 @@ dependencies {
 }
 
 publish {
-    userOrg = 'passsy'
+    userOrg = 'grandcentrix'
     groupId = 'net.grandcentrix.thirtyinch'
     artifactId = 'thirtyinch-rx'
     uploadName = 'ThirtyInch'
diff --git a/rx2/build.gradle b/rx2/build.gradle
index fb472e2d..96ae16e5 100644
--- a/rx2/build.gradle
+++ b/rx2/build.gradle
@@ -46,7 +46,7 @@ dependencies {
 }
 
 publish {
-    userOrg = 'passsy'
+    userOrg = 'grandcentrix'
     groupId = 'net.grandcentrix.thirtyinch'
     artifactId = 'thirtyinch-rx2'
     uploadName = 'ThirtyInch'
diff --git a/test/build.gradle b/test/build.gradle
index fc9d561c..1f397667 100644
--- a/test/build.gradle
+++ b/test/build.gradle
@@ -43,7 +43,7 @@ dependencies {
 }
 
 publish {
-    userOrg = 'passsy'
+    userOrg = 'grandcentrix'
     groupId = 'net.grandcentrix.thirtyinch'
     artifactId = 'thirtyinch-test'
     uploadName = 'ThirtyInch'
diff --git a/thirtyinch/build.gradle b/thirtyinch/build.gradle
index 66ee7623..19411ba4 100644
--- a/thirtyinch/build.gradle
+++ b/thirtyinch/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 }
 
 publish {
-    userOrg = 'passsy'
+    userOrg = 'grandcentrix'
     groupId = 'net.grandcentrix.thirtyinch'
     publishVersion = VERSION_NAME
     artifactId = 'thirtyinch'