Index: head/net/rabbitmq/Makefile
===================================================================
--- head/net/rabbitmq/Makefile	(revision 441684)
+++ head/net/rabbitmq/Makefile	(revision 441685)
@@ -1,80 +1,80 @@
 # Created by: Phillip Neumann <pneumann@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	rabbitmq
-PORTVERSION=	3.6.6
-PORTREVISION=	1
+PORTVERSION=	3.6.10
 CATEGORIES=	net
 MASTER_SITES=	http://www.rabbitmq.com/releases/rabbitmq-server/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}-server-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	RabbitMQ is an implementation of AMQP
 
 LICENSE=	MPL
 
 BUILD_DEPENDS=	erl:lang/erlang \
 		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \
 		xmlto:textproc/xmlto \
 		zip:archivers/zip \
 		rsync:net/rsync
 RUN_DEPENDS=	erl:lang/erlang
 
 OPTIONS_DEFINE=	ADMIN
 OPTIONS_SUB=	yes
 
 ADMIN_DESC=	Install rabbitmqadmin script
 ADMIN_USES=	python:run
 
 ALL_TARGET=	all manpages
-USES=		cpe gmake python:build tar:xz
+USES=		cpe gmake python:build shebangfix tar:xz
 USE_RC_SUBR=	rabbitmq
 NO_ARCH=	yes
 
 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+=	TARGET_DIR="${STAGEDIR}${PREFIX}/lib/erlang/lib/rabbitmq_server-${PORTVERSION}" \
 		SBIN_DIR="${STAGEDIR}${PREFIX}/sbin/" \
 		MAN_DIR="${STAGEDIR}${PREFIX}/man" \
 		DOC_INSTALL_DIR="${STAGEDIR}${EXAMPLESDIR}" \
 		VERSION="${PORTVERSION}"
 
 MAKE_JOBS_UNSAFE=	yes
 
 .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}/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.xml
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/rabbitmq
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
 	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/rabbitmq.config.example \
 		${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
 .for _file in rabbitmq-defaults rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
 	${LN} -s ../lib/erlang/lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
 .endfor
 .for _file in rabbitmq-plugins.1 rabbitmq-server.1 rabbitmqctl.1
 	${INSTALL_MAN} ${WRKSRC}/deps/rabbit/docs/${_file} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
 	${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>
Index: head/net/rabbitmq/distinfo
===================================================================
--- head/net/rabbitmq/distinfo	(revision 441684)
+++ head/net/rabbitmq/distinfo	(revision 441685)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479770211
-SHA256 (rabbitmq-server-3.6.6.tar.xz) = 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e
-SIZE (rabbitmq-server-3.6.6.tar.xz) = 2471724
+TIMESTAMP = 1495718138
+SHA256 (rabbitmq-server-3.6.10.tar.xz) = 0f478950a3e27b6b3b5aa57098eaf91822321d716a9b0bc30a4084a2c283394c
+SIZE (rabbitmq-server-3.6.10.tar.xz) = 1426900
Index: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins
===================================================================
--- head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins	(revision 441684)
+++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-plugins	(revision 441685)
@@ -1,10 +1,10 @@
---- deps/rabbit/scripts/rabbitmq-plugins.orig	2016-11-22 00:22:17 UTC
+--- deps/rabbit/scripts/rabbitmq-plugins.orig	2017-03-16 21:19:29 UTC
 +++ deps/rabbit/scripts/rabbitmq-plugins
 @@ -25,6 +25,7 @@ if [ -z "$ERL_CRASH_DUMP_SECONDS" ]; the
  fi
  
  RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
 +HOME=/var/db/rabbitmq \
  exec ${ERL_DIR}erl \
      -pa "${RABBITMQ_HOME}/ebin" \
      -noinput \
Index: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server
===================================================================
--- head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server	(revision 441684)
+++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmq-server	(revision 441685)
@@ -1,10 +1,10 @@
---- deps/rabbit/scripts/rabbitmq-server.orig	2016-11-22 00:22:59 UTC
+--- deps/rabbit/scripts/rabbitmq-server.orig	2017-03-16 21:19:29 UTC
 +++ deps/rabbit/scripts/rabbitmq-server
-@@ -151,6 +151,7 @@ start_rabbitmq_server() {
-     ensure_thread_pool_size
+@@ -157,6 +157,7 @@ start_rabbitmq_server() {
      check_start_params &&
      RABBITMQ_CONFIG_FILE=$RABBITMQ_CONFIG_FILE \
+     ERL_MAX_ETS_TABLES=$ERL_MAX_ETS_TABLES \
 +    HOME=/var/db/rabbitmq \
      exec ${ERL_DIR}erl \
          -pa ${RABBITMQ_SERVER_CODE_PATH} ${RABBITMQ_EBIN_ROOT} \
          ${RABBITMQ_START_RABBIT} \
Index: head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl
===================================================================
--- head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl	(revision 441684)
+++ head/net/rabbitmq/files/patch-deps_rabbit_scripts_rabbitmqctl	(revision 441685)
@@ -1,10 +1,10 @@
---- deps/rabbit/scripts/rabbitmqctl.orig	2016-11-22 00:23:32 UTC
+--- deps/rabbit/scripts/rabbitmqctl.orig	2017-05-22 09:52:24 UTC
 +++ deps/rabbit/scripts/rabbitmqctl
 @@ -28,6 +28,7 @@ fi
  # (e.g. forget_cluster_node --offline) require us to impersonate the
  # real node.
  RABBITMQ_USE_LONGNAME=${RABBITMQ_USE_LONGNAME} \
 +HOME=/var/db/rabbitmq \
  exec ${ERL_DIR}erl \
      -pa "${RABBITMQ_HOME}/ebin" \
      -noinput +B \
Index: head/net/rabbitmq/files/rabbitmq.in
===================================================================
--- head/net/rabbitmq/files/rabbitmq.in	(revision 441684)
+++ head/net/rabbitmq/files/rabbitmq.in	(revision 441685)
@@ -1,79 +1,79 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: rabbitmq
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable RabbitMQ
 #
 #  rabbitmq_enable="YES"
 
 . /etc/rc.subr
 
 name=rabbitmq
 rcvar=rabbitmq_enable
 
 load_rc_config $name
 
 # Set some defaults
 : ${rabbitmq_enable="NO"}
 : ${rabbitmq_user="rabbitmq"}
 
 rabbitmq_server="%%PREFIX%%/sbin/rabbitmq-server"
 rabbitmq_ctl="%%PREFIX%%/sbin/rabbitmqctl"
 rabbitmq_env_conf="%%PREFIX%%/etc/rabbitmq/rabbitmq-env.conf"
 pidfile="/var/run/${name}.pid"
 daemon_pidfile="/var/run/${name}-daemon.pid"
 
 start_cmd="${name}_start"
 stop_cmd="${name}_stop"
 rotate_logs_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} rotate_logs\"'"
 status_cmd="su -m ${rabbitmq_user} -c 'sh -c \"${rabbitmq_ctl} status\"'"
 extra_commands="rotate_logs status"
 
 : ${RABBITMQ_LOG_BASE:=/var/log/${name}}
 
 if [ -f ${rabbitmq_env_conf} ]; then
     . ${rabbitmq_env_conf}
 fi
 
 export RABBITMQ_HOME=/var/db/${name}
 
 # Prevent conflicts with amqp_client and rabbit_common applications that
 # may be installed in ERL_LIBS.
 unset ERL_LIBS
 
 rabbitmq_start()
 {
 	echo "Starting ${name}."
 
 	if [ -d ${RABBITMQ_HOME} ]; then
 		chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_HOME}
 	fi
 
-	if [ -d ${RABBITMQ_LOG_BASE} ]; then
-		chown -R ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
-	fi
+	mkdir -p ${RABBITMQ_LOG_BASE}
+ 
+	chown ${rabbitmq_user}:${rabbitmq_user} ${RABBITMQ_LOG_BASE}
 
 	if [ -f ${RABBITMQ_HOME}/.erlang.cookie ]; then
 		chmod 600 ${RABBITMQ_HOME}/.erlang.cookie
 	fi
 
 	env HOME=${RABBITMQ_HOME} /usr/sbin/daemon -c -f -u ${rabbitmq_user} -p ${pidfile} -P ${daemon_pidfile} ${rabbitmq_server}
 	debug "Running: rabbitmqctl wait ${pidfile}"
 	${rabbitmq_ctl} wait ${pidfile} >/dev/null 2>&1
 }
 
 rabbitmq_stop()
 {
 	echo "Stopping ${name}."
 	[ -f ${daemon_pidfile} ] && read daemon_pid < ${daemon_pidfile}
 	debug "Running: ${rabbitmq_ctl} stop ${pidfile}"
 	su -m ${rabbitmq_user} -c "sh -c \"${rabbitmq_ctl} stop ${pidfile}\"" >/dev/null 2>&1
 	[ -n "${daemon_pid}" ] && wait_for_pids ${daemon_pid}
 }
 
 run_rc_command "$1"
Index: head/net/rabbitmq/pkg-plist
===================================================================
--- head/net/rabbitmq/pkg-plist	(revision 441684)
+++ head/net/rabbitmq/pkg-plist	(revision 441685)
@@ -1,193 +1,197 @@
 @sample %%ETCDIR%%/rabbitmq.config.sample
 %%ADMIN%%bin/rabbitmqadmin
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/INSTALL
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APACHE2-ExplorerCanvas
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APL2-Rebar
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-APL2-Stomp-Websocket
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-base64js
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-BSD-glMatrix
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-EPL-OTP
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-EJS10
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Erlware-Commons
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Flot
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochi
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Mochiweb
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-Sammy060
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-SockJS
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MIT-jQuery164
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL-RabbitMQ
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/LICENSE-MPL2
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/background_gc.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/delegate_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/dtree.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/file_handle_cache_stats.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gatherer.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/gm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/lqueue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mirrored_supervisor_sups.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/mnesia_sync.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/pg_local.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.app
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_access_control.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_alarm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_process.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_amqqueue_sup_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_amqplain.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_cr_demo.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_auth_mechanism_plain.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_autoheal.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_binding.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_boot_steps.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_channel_sup_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_cli.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_client_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_helper_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_connection_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_main.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_control_pbe.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_core_metrics_gc.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validation.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator_accept_everything.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator_min_password_length.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_credential_validator_password_regexp.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ctl_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_dead_letter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_diagnostics.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_direct.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_disk_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_epmd_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_error_logger_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_parameters.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_direct.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_fanout.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_headers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_invalid.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_exchange_type_topic.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_fhc_helpers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_file.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_framing.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_guid.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_hipe.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_limiter.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_log.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_memory_monitor.beam
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_metrics.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_coordinator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_master.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_all.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_exactly.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_mode_nodes.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_slave.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mirror_queue_sync.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_mnesia_rename.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_file.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_ets_index.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_msg_store_gc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_node_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_parameter_validation.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_md5.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha256.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_password_hashing_sha512.beam
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_pbe.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_main.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_plugins_usage.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policies.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_policy.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prelaunch.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_prequeue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_priority_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_consumers.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_index.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_client_local.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_min_masters.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_random.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_location_validator.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_queue_master_location_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_recovery_terms.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_registry.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_resource_monitor_misc.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_restartable_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_router.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_runtime_parameters.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sasl_report_file_h.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_ssl.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_table.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_trace.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_upgrade_functions.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_variable_queue.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_version.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vhost.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/rabbit_vm.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/supervised_lifecycle.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/tcp_listener_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/truncate.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/vm_memory_monitor.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_sup.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/ebin/worker_pool_worker.beam
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/gm_specs.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/old_builtin_types.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_cli.hrl
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_core_metrics.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_framing.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_misc.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/include/rabbit_msg_store.hrl
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/README
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/amqp_client-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-1.0.3.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-1.0.1.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/mochiweb-2.13.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowboy-1.0.4.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/cowlib-1.0.2.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbit_common-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_amqp1_0-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_backend_ldap-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_auth_mechanism_ssl-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_consistent_hash_exchange-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_event_exchange-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_federation_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_jms_topic_exchange-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_agent-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_management_visualiser-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_mqtt-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_recent_history_exchange-1.2.1.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_sharding-0.1.0.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_recent_history_exchange-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_sharding-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_shovel_management-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_stomp-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_top-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_tracing-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_trust_store-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_dispatch-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt-%%VERSION%%.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_mqtt_examples-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp-%%VERSION%%.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/rabbitmq_web_stomp_examples-%%VERSION%%.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.2.1.ez
+lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/ranch-1.3.0.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/sockjs-0.3.4.ez
-lib/erlang/lib/rabbitmq_server-%%VERSION%%/plugins/webmachine-1.10.3.ez
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-defaults
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-env
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-plugins
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmq-server
 lib/erlang/lib/rabbitmq_server-%%VERSION%%/sbin/rabbitmqctl
 man/man1/rabbitmq-plugins.1.gz
 man/man1/rabbitmq-server.1.gz
 man/man1/rabbitmqctl.1.gz
 man/man5/rabbitmq-env.conf.5.gz
 sbin/rabbitmq-defaults
 sbin/rabbitmq-env
 sbin/rabbitmq-plugins
 sbin/rabbitmq-server
 sbin/rabbitmqctl
 @dir(rabbitmq,rabbitmq,755) /var/log/rabbitmq
 @dir(rabbitmq,rabbitmq,755) /var/db/rabbitmq/mnesia
 @dir(rabbitmq,rabbitmq,755) /var/db/rabbitmq