diff --git a/rabbitmq-server-cuttlefish b/rabbitmq-server-cuttlefish
new file mode 100644
index 0000000..6369c31
--- /dev/null
+++ b/rabbitmq-server-cuttlefish
@@ -0,0 +1,6 @@
+#!/usr/bin/escript
+%%
+%%! -noshell -noinput
+
+main (Args) ->
+	cuttlefish_escript:main(Args).
diff --git a/rabbitmq-server.spec b/rabbitmq-server.spec
index f1eaa4c..b58436d 100644
--- a/rabbitmq-server.spec
+++ b/rabbitmq-server.spec
@@ -7,7 +7,7 @@
 
 Name: rabbitmq-server
 Version: 3.8.9
-Release: 1%{?dist}
+Release: 2%{?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
@@ -15,6 +15,7 @@ Source1: https://github.com/rabbitmq/rabbitmq-server/releases/download/v%{versio
 Source3: rabbitmq-server.logrotate
 # curl -O https://raw.githubusercontent.com/rabbitmq/rabbitmq-server-release/rabbitmq_v3_6_16/packaging/RPMS/Fedora/rabbitmq-server.tmpfiles
 Source5: rabbitmq-server.tmpfiles
+Source6: rabbitmq-server-cuttlefish
 Patch1: rabbitmq-server-0001-Allow-guest-login-from-non-loopback-connections.patch
 Patch2: rabbitmq-server-0002-Use-default-EPMD-socket.patch
 Patch101: rabbitmq-common-0001-Use-proto_dist-from-command-line.patch
@@ -33,7 +34,6 @@ BuildRequires: systemd
 BuildRequires: xmlto
 BuildRequires: zip
 Requires: logrotate
-Requires: erlang-cuttlefish
 Requires: erlang-erts%{?_isa} >= %{erlang_minver}
 Requires: erlang-kernel%{?_isa} >= %{erlang_minver}
 Requires: erlang-eldap%{?_isa} >= %{erlang_minver}
@@ -117,7 +117,7 @@ for app in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-diagnostics 
 	ln -s %{_rabbit_libdir}/lib/rabbitmq_server-%{version}/sbin/${app} %{buildroot}%{_rabbit_libdir}/bin/${app}
 done
 
-ln -s %{_bindir}/cuttlefish %{buildroot}%{_rabbit_libdir}/bin/cuttlefish
+install -p -D -m 0755 %{S:3} %{buildroot}%{_rabbit_libdir}/bin/cuttlefish
 
 install -p -D -m 0755 scripts/rabbitmq-server.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server
 install -p -D -m 0755 scripts/rabbitmq-server-ha.ocf %{buildroot}%{_exec_prefix}/lib/ocf/resource.d/rabbitmq/rabbitmq-server-ha
@@ -199,6 +199,9 @@ done
 
 
 %changelog
+* Wed Oct  7 2020 Peter Lemenkov <lemenkov@gmail.com> - 3.8.9-2
+- Rely on bundled cuttlefish for now
+
 * Fri Sep 25 2020 John Eckersberg <jeckersb@redhat.com> - 3.8.9-1
 - Ver. 3.8.9