diff --git a/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch b/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch
index d268c65..cd7752e 100644
--- a/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch
+++ b/rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch
@@ -4,7 +4,7 @@ Subject: [PATCH] Allow guest login from non-loopback connections
 
 
 diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
-index 276ba826fa..8857372040 100644
+index e7b5181cbf..e3021da070 100644
 --- a/deps/rabbit/Makefile
 +++ b/deps/rabbit/Makefile
 @@ -39,7 +39,7 @@ define PROJECT_ENV
diff --git a/rabbitmq-server-0002-Use-default-EPMD-socket.patch b/rabbitmq-server-0002-Use-default-EPMD-socket.patch
index e7d6b9a..50d6c77 100644
--- a/rabbitmq-server-0002-Use-default-EPMD-socket.patch
+++ b/rabbitmq-server-0002-Use-default-EPMD-socket.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Use default EPMD socket
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/deps/rabbit/docs/rabbitmq-server.service.example b/deps/rabbit/docs/rabbitmq-server.service.example
-index dec70eb635..a9aa3c1614 100644
+index 69531b1ff6..9c12824a0e 100644
 --- a/deps/rabbit/docs/rabbitmq-server.service.example
 +++ b/deps/rabbit/docs/rabbitmq-server.service.example
 @@ -1,8 +1,8 @@
@@ -18,4 +18,4 @@ index dec70eb635..a9aa3c1614 100644
 +Wants=network.target epmd.socket
  
  [Service]
- Type=notify
+ # Note: You *may* wish to uncomment the following lines to apply systemd
diff --git a/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch b/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch
index 758a2fb..589453a 100644
--- a/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch
+++ b/rabbitmq-server-0003-Use-proto_dist-from-command-line.patch
@@ -11,10 +11,10 @@ first one.
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/deps/rabbit_common/src/rabbit_nodes_common.erl b/deps/rabbit_common/src/rabbit_nodes_common.erl
-index dc00eaa300..e18afc13e0 100644
+index b73debfe17..66da48fd3c 100644
 --- a/deps/rabbit_common/src/rabbit_nodes_common.erl
 +++ b/deps/rabbit_common/src/rabbit_nodes_common.erl
-@@ -105,10 +105,15 @@ epmd_port() ->
+@@ -108,10 +108,15 @@ epmd_port() ->
  ensure_epmd() ->
      Exe = rabbit_runtime:get_erl_path(),
      ID = rabbit_misc:random(1000000000),
diff --git a/rabbitmq-server-0004-force-python3.patch b/rabbitmq-server-0004-force-python3.patch
index 5affba2..e9901b4 100644
--- a/rabbitmq-server-0004-force-python3.patch
+++ b/rabbitmq-server-0004-force-python3.patch
@@ -14,19 +14,6 @@ index dc4480a181..cf93227177 100755
  
  from __future__ import print_function
  
-diff --git a/deps/amqp10_common/development.post.mk b/deps/amqp10_common/development.post.mk
-index 3f8301acd1..b7f960a7e7 100644
---- a/deps/amqp10_common/development.post.mk
-+++ b/deps/amqp10_common/development.post.mk
-@@ -2,7 +2,7 @@
- # Framing sources generation.
- # --------------------------------------------------------------------
- 
--PYTHON       ?= python
-+PYTHON       ?= python3
- CODEGEN       = $(CURDIR)/codegen.py
- CODEGEN_DIR  ?= $(DEPS_DIR)/rabbitmq_codegen
- CODEGEN_AMQP  = $(CODEGEN_DIR)/amqp_codegen.py
 diff --git a/deps/rabbit_common/codegen.py b/deps/rabbit_common/codegen.py
 index 2e7bad69e9..8a02fcbb31 100755
 --- a/deps/rabbit_common/codegen.py
@@ -37,16 +24,3 @@ index 2e7bad69e9..8a02fcbb31 100755
  
  ##  This Source Code Form is subject to the terms of the Mozilla Public
  ##  License, v. 2.0. If a copy of the MPL was not distributed with this
-diff --git a/deps/rabbit_common/development.post.mk b/deps/rabbit_common/development.post.mk
-index 65708dbcd7..ec905a4615 100644
---- a/deps/rabbit_common/development.post.mk
-+++ b/deps/rabbit_common/development.post.mk
-@@ -2,7 +2,7 @@
- # Framing sources generation.
- # --------------------------------------------------------------------
- 
--PYTHON       ?= python
-+PYTHON       ?= python3
- CODEGEN       = $(CURDIR)/codegen.py
- CODEGEN_DIR  ?= $(DEPS_DIR)/rabbitmq_codegen
- CODEGEN_AMQP  = $(CODEGEN_DIR)/amqp_codegen.py
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 5d47831..192d3bc 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -6,8 +6,8 @@
 
 
 Name: rabbitmq-server
-Version: 3.9.10
-Release: 2%{?dist}
+Version: 3.9.21
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz
 Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{version}/%{name}_%{version}.orig.tar.xz.asc
@@ -182,6 +182,9 @@ done
 
 
 %changelog
+* Tue Jul 12 2022 Peter Lemenkov <lemenkov@gmail.com> - 3.9.21-1
+- Ver. 3.9.21
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.9.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index c0cc589..9fd0388 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rabbitmq-server_3.9.10.orig.tar.xz) = a4cfb0b00a271fb9d2cbe600bb6ab03d01cd726f19a37b6b805e52250d1f7b53d0b4a07c4d666024bdae1c6e2fe514c951a0c790c5c04c0c12feca8dcfe99c4d
-SHA512 (rabbitmq-server_3.9.10.orig.tar.xz.asc) = c90e92c6f9ff8d81f4d285cdc7cebc2316ca4e7fa6eccc29ccc41ae34d1e499795850b7ef37b77daf8251da13f07d0c6052a185cf91f268110e47a11d71343a2
+SHA512 (rabbitmq-server_3.9.21.orig.tar.xz) = 2680f8803612f2c81c488f55b759bebc0b82a21bea3a781b65bd1ef042d8dd92319347fb0feaf768963f4e09ef91fb9e6a1ef7ae3ae685efcdf17db7e439d5c6
+SHA512 (rabbitmq-server_3.9.21.orig.tar.xz.asc) = c44c4f6e8e505ef6a2c230feafe5ef2a92787e7beb9c49609ba5f24d7e7b49f48b60ee58784c789631c8f42635a3ac0c2ab95f8f5e73fcc88d5d8a5a439f6e78