diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 3e6ecd5f..5daa327c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -17,7 +17,7 @@ A clear and concise description of what you expected to happen.
  - Device: [e.g. iPhone6]
  - OS: [e.g. Linux]
  - Java [output of `java -version`]
- - Version [e.g. 2.1.2]
+ - Version [e.g. 2.2.0]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5390318..c5b3bc77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,16 @@
 ## V 2.x.x (NEXT)
 
-## (next: V 2.1.3)
+## V 2.2.0 Key generation
 
-* Enh: Add key generation (courtesy Paul Schaub)
+* new: Add key generation (initial version by Paul Schaub [@vanitasvitae])
+* Fix: Encryption without having any private key.
+* Enh: Integration tests with GnuPG
+* Enh: Tiger no longer recommended
 * Enh: Add algorithm suite for OpenPGP for XMPP (courtesy Paul Schaub)
 * Enh: Add 'BouncyGPG.registerProvider()'
+* Enh: Merge [Better error messages by user9209](https://github.com/neuhalje/bouncy-gpg/pull/36)
+* Enh: Smaller fixes
+* Enh: Bump BouncyCastle to 1.64
 
 ### API Changes (breaking)
 
@@ -15,6 +21,7 @@
 * new: `BouncyGPG.registerProvider()`
 * new: key generation via `BouncyGPG.createKeyPair()`
 * new: algorithm suite for OpenPGP for XMPP (XEP-0373)
+* dep: StreamBasedKeyringConfig, ResourceBasedKeyringConfig, and StreamBasedKeyringConfig deprecated in favor of InMemoryKeyring
 
 ## V 2.1.2 OSGI bundle and minor improvements
 
diff --git a/README.md b/README.md
index 6cc00246..5401a718 100644
--- a/README.md
+++ b/README.md
@@ -202,8 +202,8 @@ repositories {
 
 //  ...
 dependencies {
-    compile 'org.bouncycastle:bcprov-jdk15on:1.60'
-    compile 'org.bouncycastle:bcpg-jdk15on:1.60'
+    compile 'org.bouncycastle:bcprov-jdk15on:1.64'
+    compile 'org.bouncycastle:bcpg-jdk15on:1.64'
     //  ...
     compile 'name.neuhalfen.projects.crypto.bouncycastle.openpgp:bouncy-gpg:2.+'
    // ...
@@ -229,7 +229,7 @@ and this dependency snippet:
     <dependency>
         <groupId>name.neuhalfen.projects.crypto.bouncycastle.openpgp</groupId>
         <artifactId>bouncy-gpg</artifactId>
-        <version>2.1.2</version>
+        <version>2.2.0</version>
     </dependency>
 ```
   
@@ -285,6 +285,12 @@ FAQ
 
    <dt>Should I <i>use</i> secring.pgp?</dt>
    <dd>No, you should implement your own key handling strategy. See <a href="#using_sec_pubring">On using (sec|pub)ring.gpg</a> below.
+
+   <dt>Can I generate keys?</dt>
+   <dd>Yes, RSA key generation is supported since 2.2.0. Generating ECC keys is NOT supported yet, although the code is there (<a href="https://github.com/neuhalje/bouncy-gpg/blob/master/src/integration-test/java/name/neuhalfen/projects/crypto/bouncycastle/openpgp/integration/KeyRingGenerators.java">gpg integration tests</a> fail)</dd>
+
+   <dt>Is compatibility with GnuPG tested?</dt>
+   <dd>Yes, since 2.2.0 `./gradlew integrationTest`  <a href="https://github.com/neuhalje/bouncy-gpg/blob/master/src/integration-test/java/name/neuhalfen/projects/crypto/bouncycastle/openpgp/integration/">tests the interoperability with gpg</a>.</dd>
 </dl>
 
 
diff --git a/build.gradle b/build.gradle
index 17663317..e52ceb8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,7 +87,7 @@ sourceCompatibility = 8
 targetCompatibility = 8
 
 group = 'name.neuhalfen.projects.crypto.bouncycastle.openpgp'
-version = '2.1.2'
+version = '2.2.0'
 
 repositories {
     jcenter()
diff --git a/examples/maven/pom.xml b/examples/maven/pom.xml
index efa1b54c..3808fb06 100644
--- a/examples/maven/pom.xml
+++ b/examples/maven/pom.xml
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>name.neuhalfen.projects.crypto.bouncycastle.openpgp</groupId>
       <artifactId>bouncy-gpg</artifactId>
-      <version>2.1.2</version>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
diff --git a/examples/reencrypt/build.gradle b/examples/reencrypt/build.gradle
index da5fcac9..4dbc6333 100644
--- a/examples/reencrypt/build.gradle
+++ b/examples/reencrypt/build.gradle
@@ -27,7 +27,7 @@ dependencies {
     compile 'org.bouncycastle:bcprov-jdk15on:1.60'
     compile 'org.bouncycastle:bcpg-jdk15on:1.60'
 
-    compile 'name.neuhalfen.projects.crypto.bouncycastle.openpgp:bouncy-gpg:2.+'
+    compile 'name.neuhalfen.projects.crypto.bouncycastle.openpgp:bouncy-gpg:2.2.0'
 
     compile 'org.slf4j:slf4j-api:1.7.22'
     compile 'ch.qos.logback:logback-classic:1.2.1'