diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61c7efebd717a09504c724136feb2fa7f1bb9397..fc0b4960e32c73e7eaf0a26c0e90d66845145a22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,13 @@
 
-#### **2.1.1 (Unreleased)**
+#### **2.1.1**
 
 FEATURES:
 * Added the groups parameter to the resource, permitting users to use the `groups` claim in the token [#PR301](https://github.com/gambol99/keycloak-proxy/pull/301)
+* Removed the authors file [#PR299](https://github.com/gambol99/keycloak-proxy/pull/299)
+
+FIXES:
+* Fixed the custom headers when upgrading to websockets [#PR311](https://github.com/gambol99/keycloak-proxy/pull/311)
+* Fixed exception when upgrading to websockets [#PR303](https://github.com/gambol99/keycloak-proxy/pull/303)
 
 #### **2.1.0**
 
diff --git a/README.md b/README.md
index 52260de3084417cbbd9aa91d90072b7324461f45..2350ea398a986558504b0d60d54706a1f325569f 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ USAGE:
    keycloak-proxy [options]
 
 VERSION:
-   v2.1.0 (git+sha: 87f0b9c-dirty, built: 21-12-2017)
+   v2.1.1 (git+sha: e92c9b2-dirty, built: 12-02-2018)
 
 AUTHOR:
    Rohith <gambol99@gmail.com>
diff --git a/doc.go b/doc.go
index 868ef70ec55447502891a19e820d6a26703732d1..fa2312b955436acf996cb33c38e383cb19770b0d 100644
--- a/doc.go
+++ b/doc.go
@@ -26,7 +26,7 @@ import (
 )
 
 var (
-	release  = "v2.1.0"
+	release  = "v2.1.1"
 	gitsha   = "no gitsha provided"
 	compiled = "0"
 	version  = ""