diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e0100005..578c73afb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 This file summarises notable changes between Live Keys versions.
 
+## 1.6.1
+
+### Bug Fixes
+
+    - Fixed code completion in some scenarios where the context was off
+    - Cursor position is now remembered when switching documents
+    - Fixed editor scrolling during some indenting scenarios
+
 ## 1.6.0 - Rename to Livekeys
 
 ### Support
diff --git a/README.md b/README.md
index 6da09679d..9fca9fb16 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 [![Build Status](https://travis-ci.org/live-keys/livekeys.svg?branch=master)](https://travis-ci.org/live-keys/livekeys)
 [![Build status](https://ci.appveyor.com/api/projects/status/3l5t69h7q3gpkec1?svg=true)](https://ci.appveyor.com/project/dinusv/livekeys)
 
- * **Version**: 1.6.0
+ * **Version**: 1.6.1
  * **License**: LGPL
  * **Website**: [livekeys.io](https://livekeys.io)
  * **Demo**: [www.youtube.com/watch?v=ZPt5KSy1wh0](https://www.youtube.com/watch?v=ZPt5KSy1wh0)
diff --git a/application/src/livekeys.h b/application/src/livekeys.h
index fd88f8e3a..f82077816 100644
--- a/application/src/livekeys.h
+++ b/application/src/livekeys.h
@@ -31,7 +31,7 @@
 
 #define LIVEKEYS_VERSION_MAJOR 1
 #define LIVEKEYS_VERSION_MINOR 6
-#define LIVEKEYS_VERSION_PATCH 0
+#define LIVEKEYS_VERSION_PATCH 1
 
 // Forward declarations
 // --------------------
diff --git a/livekeys.json b/livekeys.json
index caef6312f..b39370874 100644
--- a/livekeys.json
+++ b/livekeys.json
@@ -1,10 +1,10 @@
 {
-    "version" : "1.6.0",
+    "version" : "1.6.1",
     "name": "livekeys",
     "webpage": "https://livekeys.io",
     "components" : {
         "livekeys" : {
-            "version" : "1.6.0",
+            "version" : "1.6.1",
             "versionsync" : {
                 "README.md": "\\s*(?:\\* \\*\\*Version\\*\\*\\:)\\s*([0-9]*)\\.{1}([0-9]*)\\.{1}([0-9]*)\\s*",
                 "application/src/livekeys.h" : [