diff --git a/ChangeLog b/ChangeLog
index bc9b28df..94c21562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,42 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
+## [2.36.0] - 2021-02-15
+### Added
+- Encrypted lookup and publications to ECIES-x25519 floodfiils
+- Yggdrasil transports and reseeds
+- Dump addressbook in hosts.txt format
+- Request RouterInfo through exploratory tunnels if direct connection to fllodfill is not possible
+- Threads naming
+- Check if public x25519 key is valid 
+- ECIES-X25519-AEAD-Ratchet for shared local destination
+- LeaseSet creation timeout for I2CP session
+- Resend RouterInfo after some interval for longer NTCP2 sessions
+- Select reachable router of inbound tunnel gateway
+- Reseed if no compatible routers in netdb 
+- Refresh on swipe in Android webconsole
+### Changed
+- reg.i2p for default addressbook instead inr.i2p
+- ECIES-x25519 (crypto type 4) for new routers
+- Try to connect to all compatible addresses from peer's RouterInfo
+- Replace LeaseSet completely if store type changes 
+- Try ECIES-X25519-AEAD-Ratchet tag before ElGamal
+- Don't detach ECIES-X25519-AEAD-Ratchet session from destination immediately
+- Viewport and styles on error in HTTP proxy
+- Don't create notification when Windows taskbar restarted 
+- Cumulative SSU ACK bitfields
+- limit tunnel length to 8 hops
+- Limit tunnels quantity to 16
+### Fixed
+- Handling chunked HTTP response in addressbook
+- Missing ECIES-X25519-AEAD-Ratchet tags for multiple streams with the same destination
+- Correct NAME for NAMING REPLY in SAM
+- SSU crash on termination
+- Offline signature length for stream close packet
+- Don't send updated LeaseSet through a terminated session
+- Decryption of follow-on ECIES-X25519-AEAD-Ratchet NSR messages
+- Non-confirmed LeaseSet is resent too late for ECIES-X25519-AEAD-Ratchet session
+
 ## [2.35.0] - 2020-11-30
 ### Added
 - ECIES-x25519 routers
diff --git a/appveyor.yml b/appveyor.yml
index cc6d130b..4247c5ab 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.35.0.{build}
+version: 2.36.0.{build}
 pull_requests:
   do_not_increment_build_number: true
 branches:
diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index d622ced5..a9f10510 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -1,7 +1,7 @@
 %define git_hash %(git rev-parse HEAD | cut -c -7)
 
 Name:          i2pd-git
-Version:       2.35.0
+Version:       2.36.0
 Release:       git%{git_hash}%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd
@@ -137,6 +137,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Mon Feb 15 2021 orignal <i2porignal@yandex.ru> - 2.36.0
+- update to 2.36.0
+
 * Mon Nov 30 2020 orignal <i2porignal@yandex.ru> - 2.35.0
 - update to 2.35.0
 
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index d147c269..d8ae9541 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -1,5 +1,5 @@
 Name:          i2pd
-Version:       2.35.0
+Version:       2.36.0
 Release:       1%{?dist}
 Summary:       I2P router written in C++
 Conflicts:     i2pd-git
@@ -135,6 +135,9 @@ getent passwd i2pd >/dev/null || \
 
 
 %changelog
+* Mon Feb 15 2021 orignal <i2porignal@yandex.ru> - 2.36.0
+- update to 2.36.0
+
 * Mon Nov 30 2020 orignal <i2porignal@yandex.ru> - 2.35.0
 - update to 2.35.0
 
diff --git a/debian/changelog b/debian/changelog
index 7ca75409..d83fb88c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2pd (2.36.0-1) unstable; urgency=high
+
+  * updated to version 2.36.0/0.9.49
+
+ -- orignal <orignal@i2pmail.org>  Mon, 15 Feb 2021 16:00:00 +0000
+
 i2pd (2.35.0-1) unstable; urgency=high
 
   * updated to version 2.35.0/0.9.48
diff --git a/libi2pd/version.h b/libi2pd/version.h
index f28d88c0..7bdd3fc5 100644
--- a/libi2pd/version.h
+++ b/libi2pd/version.h
@@ -16,7 +16,7 @@
 #define MAKE_VERSION_NUMBER(a,b,c) ((a*100+b)*100+c)
 
 #define I2PD_VERSION_MAJOR 2
-#define I2PD_VERSION_MINOR 35
+#define I2PD_VERSION_MINOR 36
 #define I2PD_VERSION_MICRO 0
 #define I2PD_VERSION_PATCH 0
 #define I2PD_VERSION MAKE_VERSION(I2PD_VERSION_MAJOR, I2PD_VERSION_MINOR, I2PD_VERSION_MICRO)
@@ -30,7 +30,7 @@
 
 #define I2P_VERSION_MAJOR 0
 #define I2P_VERSION_MINOR 9
-#define I2P_VERSION_MICRO 48
+#define I2P_VERSION_MICRO 49
 #define I2P_VERSION_PATCH 0
 #define I2P_VERSION MAKE_VERSION(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)
 #define I2P_VERSION_NUMBER MAKE_VERSION_NUMBER(I2P_VERSION_MAJOR, I2P_VERSION_MINOR, I2P_VERSION_MICRO)