diff --git a/rabbitmq-server-3.9.5.tar.xz b/rabbitmq-server-3.9.5.tar.xz
deleted file mode 100644
index db5b1f6..0000000
--- a/rabbitmq-server-3.9.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5523f819030d1fb570ff4a38c052e77c21699051a9b6a6e401c414e85865daf2
-size 3453660
diff --git a/rabbitmq-server-3.9.5.tar.xz.asc b/rabbitmq-server-3.9.5.tar.xz.asc
deleted file mode 100644
index c73dae3..0000000
--- a/rabbitmq-server-3.9.5.tar.xz.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEECpryEV9Gh70pgDoga3OjbmAm38oFAmEooc4ACgkQa3OjbmAm
-38qooQ//b0JMfVwDvILu9etytwm6+u58mng0otUzosKZcnufASUw/tYonud7xxCx
-quFBH5ZKDN1Yn6DmVw2582GOrgDZW7G4QuU9tZFclyRU2fC5rAXlhV/UIq558t+K
-RqPyIBM/T1gQSwsFNW8jVmGXsqtOSNPd2ECAIuv4t18uQVXnw0h0aIjOL7xg5X0/
-fSxYwQ+01o4IsANP3ZRaqScOp0edV6ITPZEvWQVGkmjLVVUUv2qfaAbnYSPVvGit
-FBJp+lt2smyDwEc8AhntKEfZBaAJ957nWPvHTC2Tt6tzo6luhmf5jRJwe6zirwOF
-Tqe2KhJSSvertZSeDEvRZDXjWKOLQbCEc67GoSg8oP6ZGpHWYE69e+9EOKhhhwVW
-Rt0r1orLqz9zR+YlCvDCc6em6Y8mb1DZu3wqrfw8yvtPAHMXMBFOifRctBT6/3gR
-9lXK13EkEz0nmLnzI6P1C6WmoO2+vbo/1AC1dnnpe5D6kLKPvQUN6GDSX/laPkju
-BYEST1s66CsBISGhmSbDIgLOKMkcc4pQjs3sJvJS+UlnSn6k9DEtfV4O7cYtD/TU
-H2aRk0j0niyMvDaDRNPylt0oaIUBEkCpDMvsdSt3zzSa3VzR+XHM7meiQzYOEB8u
-/XXXFuggwDlFQZTmCBG2NemGr2IIQCV1prFncYrN+3tdlCDII8c=
-=pM+v
------END PGP SIGNATURE-----
diff --git a/rabbitmq-server-3.9.6.tar.xz b/rabbitmq-server-3.9.6.tar.xz
new file mode 100644
index 0000000..c956ebe
--- /dev/null
+++ b/rabbitmq-server-3.9.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60254e315b1b38c733a598b4d98c1de8cf805eb77900cc1e0989f559cc911d2c
+size 3458888
diff --git a/rabbitmq-server-3.9.6.tar.xz.asc b/rabbitmq-server-3.9.6.tar.xz.asc
new file mode 100644
index 0000000..cdcf2fa
--- /dev/null
+++ b/rabbitmq-server-3.9.6.tar.xz.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEECpryEV9Gh70pgDoga3OjbmAm38oFAmFDqKEACgkQa3OjbmAm
+38otkQ/8CYhAMFlH7fRQ21VuE3m7AhIAjblKmXrYgjPSRsj13IKpKyZoGmkq0JhP
+hxahQm+v4UM4Dp6HXtQt8EFuVbUuBsgxtKhnZiP8slvQGWF9qgSqJRR1C7WupT/v
+/TKsMynvAzXoBzTeq8Q9rzMwBqMU7TXpJOUxrGwirEYW8wSCCaQtYaDBm27K44h2
+OIXtfu1dVzQ2f2JQaVynAFP9aKqHWt2c1VfwIgpkefCZgo7NaWNpEv/AObp/7i+/
+AOE8FmkQ/kxDsFj6bEtCdrjCqv5eC1kqJgqcBpMDe9spBP+NXrzEW4wKvgC2q/qc
+0tsxpO76nAhLsIBSPZq2UIRLJaf4gLXqt5N2m888WWaslFhWkvOwSgzMSPl6MYQJ
+m9GsEG+pKiVgI1aFHRV/NGrGxcI8B/7Gx2+WwcKRFqFkT8QSJDwKS88+nL2wFg2N
+k4ZUdXE4AT9QnInR34ydBQMAQSLCfoFH/JCFgwvXPY1qQBJk3QNLxdf+G23u8g0Q
+iD6Rl9hlOhSag0mbMHYseU3RTkOsvgm3Ss53WHxWIKHHy8LX+FOKRlv0mO/buZmF
+G1UrNHfK33oYLNO/PZnDm0IkTQshYKKrkPG4lbeQWZFNmYKQefAp1VwBGGoNkG+w
+cnDwo5PsWEmyVOudEvlZ5EFqBiY4L2Z5UWEmrEQtta/nIT3KMRA=
+=66nQ
+-----END PGP SIGNATURE-----
diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index e34cb5c..b7e2c06 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Fri Sep 17 00:15:42 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>
+
+- Update to 3.9.6:
+  + Core Server
+    * Bug Fixes
+      - TLS information delivered in Proxy protocol header is now
+        attached to connection metrics as if it was provided by a
+        non-proxying client.
+      - max_message_size had a one-off error in the validator.
+      - mirroring_sync_batch_size was incorrectly validated as if
+        it represented batch size in bytes.
+  + Stream Plugin
+    * Bug Fixes
+      - Offset parameters were not stored correctly in some cases.
+      - Partitions list order is now stable.
+      - When stream clients close connections abruptly, publisher
+        and consumer metrics get cleaned up correctly.
+  + Management Plugin
+    * Enhancements
+      - Stream publishers are now listed on the individual stream
+        page.
+      - Counters have been added to the tiles of several sections
+        on detail pages.
+  + Dependency Upgrades
+    * Osiris was upgraded to 1.2.0
+    * Ranch was upgraded to 2.1.0
+- Removes socat dependency from specs.
+  (gh#rabbitmq/rabbitmq-packaging#8)
+- Fix rpmlint errors:
+  * E: script-without-shebang for autocomplete scripts
+  * E: dir-or-file-in-run /run/rabbitmq
+
 -------------------------------------------------------------------
 Tue Sep  7 07:52:54 UTC 2021 - Fusion Future <qydwhotmail@gmail.com>
 
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index 20459e3..b8e48ae 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -41,7 +41,7 @@
 %define _rabbitmq_group rabbitmq
 
 Name:           rabbitmq-server
-Version:        3.9.5
+Version:        3.9.6
 Release:        0
 Summary:        A message broker supporting AMQP, STOMP and MQTT
 License:        MPL-2.0
@@ -75,7 +75,6 @@ Requires(pre):  %fillup_prereq
 Requires:       rabbitmq-server-plugins
 BuildRequires:  pkgconfig(systemd)
 %{?systemd_ordering}
-Requires:       socat
 # Do not use noarch since the Erlang packaging does not really allow that
 #BuildArch:      noarch
 
@@ -243,7 +242,6 @@ done
 %{_sbindir}/rabbitmq-diagnostics
 %{_sbindir}/rabbitmq-streams
 
-%ghost %dir /run/rabbitmq
 #
 %dir /usr/lib/ocf/
 %dir /usr/lib/ocf/resource.d/
@@ -253,6 +251,9 @@ done
 %doc README* CODE_OF_CONDUCT.md CONTRIBUTING.md deps/rabbit/docs/set_rabbitmq_policy.sh.example
 %{_mandir}/man5/rabbitmq-env.conf.5%{?ext_man}
 %{_mandir}/man8/rabbitmq*.8%{?ext_man}
+# E: script-without-shebang
+%exclude %{_rabbit_libdir}/autocomplete/bash_autocomplete.sh
+%exclude %{_rabbit_libdir}/autocomplete/zsh_autocomplete.sh
 
 %if %{with split_plugins}
 %files plugins