diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3ee0c0d0c..9d28fd15ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 1.6.11 / 2017-02-20
+
+* [ENHANCEMENT] Documentation updates [#648] [#656]
+* [ENHANCEMENT] Add secret completions to edit command in zsh [#654]
+* [BUGFIX] Avoid escaping values added to secrets [#658]
+* [BUGFIX] Fix parsing of GPG UIDs [#650]
+
 ## 1.6.10 / 2017-01-18
 
 * [ENHANCEMENT] Add Travis MacOS builds [#618]
diff --git a/VERSION b/VERSION
index 1df3b822c7..99c026bdee 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.6.10
+1.6.11
diff --git a/main.go b/main.go
index 4c29423fbf..ad7ab352fc 100644
--- a/main.go
+++ b/main.go
@@ -118,7 +118,7 @@ func getVersion() semver.Version {
 	return semver.Version{
 		Major: 1,
 		Minor: 6,
-		Patch: 10,
+		Patch: 11,
 		Pre: []semver.PRVersion{
 			{VersionStr: "git"},
 		},