diff --git a/ChangeLog b/ChangeLog
index 9a79440e..2128f5d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,49 @@
 # for this file format description,
 # see https://github.com/olivierlacan/keep-a-changelog
 
-## [2.38.0] - 2021-03-17
+## [2.39.0] - 2021-08-23
+### Added
+- Short tunnel build messages
+- Localization. To: Russian, Ukrainian, Turkmen, Uzbek and Afrikaans
+- Custom CSS styles for webconsole
+- Avoid slow tunnels with more than 250 ms per hop
+- Process DELAY_REQUESTED streaming option
+- "certsdir" options for certificates location
+- Keep own RouterInfo in NetBb
+- Pick ECIES routers only for tunnels on non-x64
+- NTP sync through ipv6
+- Allow ipv6 addresses for UDP server tunnels
+### Changed
+- Rekey of all routers to ECIES
+- Better distribution for random tunnel's peer selection
+- Yggdrasil reseed for v0.4, added two more
+- Encryption type 0,4 by default for server tunnels
+- Handle i2cp.dontPublishLeaseSet param for all destinations 
+- reg.i2p for subscriptions
+- LeaseSet type 3 by default
+- Don't allocate payload buffer for every single ECIESx25519 message
+- Prefer public ipv6 instead rfc4941 
+- Optimal padding for one-time ECIESx25519 message
+- Don't send datetime block for one-time ECIESx25519 message with one-time key
+- Router with expired introducer is still valid
+- Don't disable floodfill if still reachable by ipv6
+- Set minimal version for floodfill to 0.9.38
+- Eliminate extra lookups for sequential fragments on tunnel endpoint
+- Consistent path for explicit peers
+- Always create new tunnel from exploratory pool
+- Don't try to connect to a router not reachable from us
+- Mark additional ipv6 addresses/nets as reserved (#1679)
+### Fixed
+- Zero-hop tunnels
+- Crash upon SAM session termination
+- Build with boost < 1.55.0
+- Address type for NTCP2 acceptors
+- Check of ipv4/ipv6 address
+- Request router to send to if not in NetDb
+- Count outbound traffic for zero-hop tunnels
+- URLdecode domain for registration string generator in webconsole
+
+## [2.38.0] - 2021-05-17
 ### Added
 - Publish ipv6 introducers
 - Bind ipv6 or yggdrasil NTCP2 acceptor to specified address 
diff --git a/contrib/i2pd.conf b/contrib/i2pd.conf
index 6ccc6f85..06325e84 100644
--- a/contrib/i2pd.conf
+++ b/contrib/i2pd.conf
@@ -108,8 +108,7 @@ port = 7070
 # user = i2pd
 # pass = changeme
 ## Select webconsole language
-## Currently supported english (default), afrikaans, russian, turkmen and ukrainian languages
-
+## Currently supported english (default), afrikaans, russian, turkmen, ukrainian and uzbek languages
 # lang = english
 
 [httpproxy]
diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index 1061fc8f..c9a848ee 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -56,9 +56,14 @@ cd build
 %endif
 %endif
 
+
+%if 0%{?fedora} >= 36
+pushd redhat-linux-build
+%else
 %if 0%{?fedora} >= 33
 pushd %{_target_platform}
 %endif
+%endif
 
 %if 0%{?mageia} > 7
 pushd build
@@ -77,9 +82,13 @@ popd
 %install
 pushd build
 
+%if 0%{?fedora} >= 36
+pushd redhat-linux-build
+%else
 %if 0%{?fedora} >= 33
 pushd %{_target_platform}
 %endif
+%endif
 
 %if 0%{?mageia}
 pushd build
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index a2994f28..218a6bf7 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -54,9 +54,13 @@ cd build
 %endif
 %endif
 
+%if 0%{?fedora} >= 36
+pushd redhat-linux-build
+%else
 %if 0%{?fedora} >= 33
 pushd %{_target_platform}
 %endif
+%endif
 
 %if 0%{?mageia} > 7
 pushd build
@@ -75,9 +79,13 @@ popd
 %install
 pushd build
 
+%if 0%{?fedora} >= 36
+pushd redhat-linux-build
+%else
 %if 0%{?fedora} >= 33
 pushd %{_target_platform}
 %endif
+%endif
 
 %if 0%{?mageia}
 pushd build