diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile
index fa6d5787d01b..d572a0a68c5d 100644
--- a/net/rabbitmq/Makefile
+++ b/net/rabbitmq/Makefile
@@ -1,86 +1,86 @@
 # Created by: Phillip Neumann <pneumann@gmail.com>
 
 PORTNAME=	rabbitmq
 DISTVERSION=	3.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/rabbitmq/rabbitmq-server/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 
 MAINTAINER=	erlang@FreeBSD.org
 COMMENT=	Erlang implementation of AMQP
 
 LICENSE=	MPL11
 LICENSE_FILE=	${WRKSRC}/LICENSE-MPL-RabbitMQ
 
 BUILD_DEPENDS=	erlang-runtime21>=21.3:lang/erlang-runtime21 \
 		elixir>=1.10:lang/elixir \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} \
 		xmlto:textproc/xmlto \
 		zip:archivers/zip \
 		rsync:net/rsync
 RUN_DEPENDS=	erlang-runtime21>=21.3:lang/erlang-runtime21
 
 USES=		cpe gmake shebangfix tar:xz
 USE_LOCALE=	en_US.UTF-8
 USE_RC_SUBR=	rabbitmq
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	ADMIN
 OPTIONS_SUB=	yes
 
 ADMIN_DESC=	Install rabbitmqadmin script
 ADMIN_USES=	python
 ADMIN_USES_OFF=	python:build
 
 ALL_TARGET=	install
 
 USERS=		rabbitmq
 GROUPS=		rabbitmq
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 CPE_VENDOR=	pivotal_software
 
 REINPLACE_ARGS=	-i ""
 SCRIPTS_DIR=	${WRKSRC}/deps/rabbit/scripts
 SHEBANG_FILES=	deps/rabbitmq_management/bin/rabbitmqadmin
 MAKE_ARGS+=	PYTHON=${PYTHON_CMD}
 MAKE_ENV+=	PATH="${LOCALBASE}/lib/erlang21/bin:${PATH}" \
 		RMQ_LIBDIR="${PREFIX}/lib" \
 		MANDIR="${PREFIX}/man" \
 		DESTDIR="${STAGEDIR}"
 
 MAKE_JOBS_UNSAFE=	yes
 
 ERLANG_LIB=	erlang21
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/rabbitmq|${PREFIX}/etc/rabbitmq|g ; s|/var/lib|/var/db|g ; s|$${ERL_DIR}erl|${PREFIX}/lib/${ERLANG_LIB}/bin/erl|g' \
 		${SCRIPTS_DIR}/rabbitmq-server \
 		${SCRIPTS_DIR}/rabbitmqctl \
 		${SCRIPTS_DIR}/rabbitmq-env \
 		${SCRIPTS_DIR}/rabbitmq-plugins \
 		${SCRIPTS_DIR}/rabbitmq-defaults \
 		${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
 	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/advanced.config.example \
 	${STAGEDIR}${PREFIX}/etc/rabbitmq/advanced.config.sample
 	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.conf.example \
 	${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.conf.sample
 .for _file in cuttlefish rabbitmq-defaults rabbitmq-diagnostics rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmq-upgrade rabbitmqctl
 	${LN} -s ../lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
 .endfor
 	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/*.8  ${STAGEDIR}${MAN1PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/rabbitmq-env.conf.5 ${STAGEDIR}${MAN5PREFIX}/man/man5
 
 post-install-ADMIN-on:
 	${INSTALL} ${WRKSRC}/deps/rabbitmq_management/bin/rabbitmqadmin ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs b/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs
new file mode 100644
index 000000000000..56883aed6a26
--- /dev/null
+++ b/net/rabbitmq/files/patch-deps_rabbitmq__cli_mix.exs
@@ -0,0 +1,11 @@
+--- deps/rabbitmq_cli/mix.exs.orig	2021-06-23 10:54:40 UTC
++++ deps/rabbitmq_cli/mix.exs
+@@ -20,7 +20,7 @@ defmodule RabbitMQCtl.MixfileBase do
+     [
+       app: :rabbitmqctl,
+       version: "3.8.0-dev",
+-      elixir: ">= 1.7.0 and < 1.11.0",
++      elixir: ">= 1.7.0",
+       build_embedded: Mix.env == :prod,
+       start_permanent: Mix.env == :prod,
+       escript: [main_module: RabbitMQCtl,