diff --git a/contrib/rpm/i2pd-git.spec b/contrib/rpm/i2pd-git.spec
index 46ed8a51..c99c2c8b 100644
--- a/contrib/rpm/i2pd-git.spec
+++ b/contrib/rpm/i2pd-git.spec
@@ -11,9 +11,9 @@ URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/openssl/i2pd-openssl.tar.gz
 
 %if 0%{?rhel} == 7
-BuildRequires: cmake3
+	BuildRequires: cmake3
 %else
-BuildRequires: cmake
+	BuildRequires: cmake
 %endif
 
 BuildRequires: chrpath
@@ -82,8 +82,12 @@ make %{?_smp_mflags}
 %install
 pushd build
 
-%if 0%{?fedora} >= 33
-	pushd %{_target_platform}
+%if 0%{?fedora} >= 36
+	pushd redhat-linux-build
+%else
+	%if 0%{?fedora} >= 33
+		pushd %{_target_platform}
+	%endif
 %endif
 
 %if 0%{?mageia}
diff --git a/contrib/rpm/i2pd.spec b/contrib/rpm/i2pd.spec
index a2994f28..1339fe90 100644
--- a/contrib/rpm/i2pd.spec
+++ b/contrib/rpm/i2pd.spec
@@ -9,9 +9,9 @@ URL:           https://github.com/PurpleI2P/i2pd
 Source0:       https://github.com/PurpleI2P/i2pd/archive/%{version}/%name-%version.tar.gz
 
 %if 0%{?rhel} == 7
-BuildRequires: cmake3
+	BuildRequires: cmake3
 %else
-BuildRequires: cmake
+	BuildRequires: cmake
 %endif
 
 BuildRequires: chrpath
@@ -54,33 +54,41 @@ cd build
 %endif
 %endif
 
-%if 0%{?fedora} >= 33
-pushd %{_target_platform}
+%if 0%{?fedora} >= 36
+	pushd redhat-linux-build
+%else
+	%if 0%{?fedora} >= 33
+		pushd %{_target_platform}
+	%endif
 %endif
 
 %if 0%{?mageia} > 7
-pushd build
+	pushd build
 %endif
 
 make %{?_smp_mflags}
 
 %if 0%{?fedora} >= 33
-popd
+	popd
 %endif
 
 %if 0%{?mageia} > 7
-popd
+	popd
 %endif
 
 %install
 pushd build
 
-%if 0%{?fedora} >= 33
-pushd %{_target_platform}
+%if 0%{?fedora} >= 36
+	pushd redhat-linux-build
+%else
+	%if 0%{?fedora} >= 33
+		pushd %{_target_platform}
+	%endif
 %endif
 
 %if 0%{?mageia}
-pushd build
+	pushd build
 %endif
 
 chrpath -d i2pd