Index: net/rabbitmq/Makefile
===================================================================
--- net/rabbitmq/Makefile
+++ net/rabbitmq/Makefile
@@ -70,7 +70,9 @@
 	@${MKDIR} ${STAGEDIR}/var/db/rabbitmq/mnesia
 	@${MKDIR} ${STAGEDIR}/var/log/rabbitmq
 	${INSTALL_DATA} ${WRKSRC}/deps/rabbit/docs/advanced.config.example \
-	${STAGEDIR}${PREFIX}/etc/rabbitmq/rabbitmq.config.sample
+	${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 rabbitmq-defaults rabbitmq-diagnostics rabbitmq-env rabbitmq-plugins rabbitmq-server rabbitmqctl
 	${LN} -s ../lib/rabbitmq_server-${PORTVERSION}/sbin/${_file} ${STAGEDIR}${PREFIX}/sbin
 .endfor
Index: net/rabbitmq/pkg-plist
===================================================================
--- net/rabbitmq/pkg-plist
+++ net/rabbitmq/pkg-plist
@@ -1,4 +1,5 @@
-@sample %%ETCDIR%%/rabbitmq.config.sample
+@sample %%ETCDIR%%/advanced.config.sample
+@sample %%ETCDIR%%/rabbitmq.conf.sample
 %%ADMIN%%bin/rabbitmqadmin
 lib/rabbitmq_server-%%VERSION%%/INSTALL
 lib/rabbitmq_server-%%VERSION%%/LICENSE