diff --git a/CHANGELOG.md b/CHANGELOG.md
index 908c73a..2fcd349 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
+    V3.6.1 - Nov 2020
+        - Extended polish translation to all settings screens.
+        - Possible fix for issue with failing to shutdown system sometimes.
 	V3.6.0 - Sep 2020
 	    - Added a phone sensor datasource, primarily for people to use for testing without needing a watch.
 	V3.5.0 - Aug 2020
diff --git a/app/release/app-release-3.6.1.apk b/app/release/app-release-3.6.1.apk
new file mode 100644
index 0000000..0004c6e
Binary files /dev/null and b/app/release/app-release-3.6.1.apk differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index b925834..0004c6e 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/app-release-3.6.1h.apk b/app/release/old_versions/app-release-3.6.1h.apk
similarity index 100%
rename from app/release/app-release-3.6.1h.apk
rename to app/release/old_versions/app-release-3.6.1h.apk
diff --git a/app/release/app-release-3.6.1j.apk b/app/release/old_versions/app-release-3.6.1j.apk
similarity index 100%
rename from app/release/app-release-3.6.1j.apk
rename to app/release/old_versions/app-release-3.6.1j.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 476d01b..ab0db70 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 82,
-      "versionName": "3.6.1j",
+      "versionCode": 83,
+      "versionName": "3.6.1",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 47ecbd2..c63a94d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
-    android:versionCode="82"
-    android:versionName="3.6.1j">
+    android:versionCode="83"
+    android:versionName="3.6.1">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c39a2df..37ff10f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,11 +2,10 @@
 <resources>
     <string name="app_name">OpenSeizureDetector</string>
     <string name="changelog">
+        \n V3.6.1 - Possible fix for issue with shutting down system and expanded Polish translation to all settings screens.
         \n V3.6 - Added phone sensor data source for testing without a watchs
-        \n V3.5 - Added support for Phone Call Alerts, using separate OpenSeizureDetector Dialler App
-        \n      - Added Unique Identifier (UUID) to SMS alerts so they can be detected as OpenSeizureDetector SMS messages on client phone.
-        \n V3.4.0 - Aug 2020
-        \n    - Added support for BLE Data Source
+        \n V3.5 - Added support for SMS Annunciator App
+        \n V3.4 - Added support for BLE Data Source
     </string>
     <string name="UpgradeMsg">
         OpenSeizureDetector does not collect any personal data.