diff --git a/ChangeLog b/ChangeLog
index d8ab87de..0b05d3ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.21.0] - 2018-10-04
+### Added
+- EdDSA, x25519 and SipHash from openssl 1.1.1
+- NTCP2 ipv6 incoming connections
+- Show total number of destination's outgoing tags in the web console
+### Changed
+- Android build with openssl 1.1.1/boost 1.64
+- Bandwidth classes 'P' and 'X' don't add 'O' anymore
+### Fixed
+- Update own RouterInfo if no SSU
+- Recognize 'P' and 'X' routers as high bandwidth without 'O'
+- NTCP address doesn't disappear if NTCP2 enabled
+
 ## [2.20.0] - 2018-08-23
 ### Added
 - Full implementation of NTCP2
diff --git a/Win32/installer.iss b/Win32/installer.iss
index e340c65f..8372a444 100644
--- a/Win32/installer.iss
+++ b/Win32/installer.iss
@@ -1,5 +1,5 @@
 #define I2Pd_AppName "i2pd"
-#define I2Pd_ver "2.20.0"
+#define I2Pd_ver "2.21.0"
 #define I2Pd_Publisher "PurpleI2P"
 
 [Setup]
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 1741be1f..e5a711aa 100755
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -3,7 +3,7 @@
     package="org.purplei2p.i2pd"
     android:installLocation="auto"
     android:versionCode="1"
-    android:versionName="2.20.0">
+    android:versionName="2.21.0">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/android/build.gradle b/android/build.gradle
index 177ea594..6f46471a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -29,7 +29,7 @@ android {
         targetSdkVersion 28
         minSdkVersion 14
         versionCode 1
-        versionName "2.20.0"
+        versionName "2.21.0"
         ndk {
             abiFilters 'armeabi-v7a'
             abiFilters 'x86'
diff --git a/appveyor.yml b/appveyor.yml
index 8ed60c23..bcaad455 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.20.{build}
+version: 2.21.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index edad8228..71bc2b31 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -96,6 +96,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Thu Oct 4 2018 orignal <i2porignal@yandex.ru> - 2.21.0
+- update to 2.21.0
+
 * Thu Aug 23 2018 orignal <i2porignal@yandex.ru> - 2.20.0
 - update to 2.20.0
 
diff --git a/debian/changelog b/debian/changelog
index 9d721eb8..f16fb10d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2pd (2.21.0-1) unstable; urgency=medium
+
+  * updated to version 2.21.0/0.9.37
+
+ -- orignal <orignal@i2pmail.org>  Thu, 4 Oct 2018 16:00:00 +0000
+
 i2pd (2.20.0-1) unstable; urgency=medium
 
   * updated to version 2.20.0/0.9.36
diff --git a/libi2pd/version.h b/libi2pd/version.h
index 7c015e84..3f09928c 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -7,7 +7,7 @@
 #define MAKE_VERSION(a,b,c) STRINGIZE(a) "." STRINGIZE(b) "." STRINGIZE(c)
 
 #define I2PD_VERSION_MAJOR 2
-#define I2PD_VERSION_MINOR 20
+#define I2PD_VERSION_MINOR 21
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
@@ -21,7 +21,7 @@
 
 #define I2P_VERSION_MAJOR 0
 #define I2P_VERSION_MINOR 9
-#define I2P_VERSION_MICRO 36
+#define I2P_VERSION_MICRO 37
 #define I2P_VERSION_PATCH 0
 #define I2P_VERSION MAKE_VERSION(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)
 
diff --git a/qt/i2pd_qt/android/AndroidManifest.xml b/qt/i2pd_qt/android/AndroidManifest.xml
index c62e118e..ddb6aeb1 100644
--- a/qt/i2pd_qt/android/AndroidManifest.xml
+++ b/qt/i2pd_qt/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.20.0" android:versionCode="1" android:installLocation="auto">
+<manifest package="org.purplei2p.i2pd" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.21.0" android:versionCode="1" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="11" android:targetSdkVersion="23"/>
         <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
     <!-- <application android:hardwareAccelerated="true" -->