diff -Naur --exclude=.svn macports/rabbitmq-server/Portfile rabbitmq/rabbitmq-server/Portfile
--- macports/rabbitmq-server/Portfile	2012-06-25 15:43:48.000000000 +0100
+++ rabbitmq/rabbitmq-server/Portfile	2012-06-22 17:14:26.000000000 +0100
@@ -3,7 +3,7 @@
 
 PortSystem 1.0
 name		rabbitmq-server
-version		2.8.2
+version		2.8.4
 categories	net 
 maintainers	paperplanes.de:meyer openmaintainer
 platforms	darwin
@@ -24,11 +24,11 @@
 
 checksums \
     ${name}-${version}${extract.suffix} \
-        sha1 3d0da2996a30747c5875cfbf887c61d80d765ef4 \
-        rmd160 89509488902089d3c457dfcf3cc44a6b615b33cf \
+        sha1 993746bcebb2b5f09e3ffea7a3b47eccb87121af \
+        rmd160 ef153ed2fe841b43811b2ac47f56b154b6982d3c \
     ${name}-generic-unix-${version}${extract.suffix} \
-        sha1 b564d3277af5531f120bff822560b157432b2fa7 \
-        rmd160 b2e38f9163e05bc73fa793f6120c99940239a7f1
+        sha1 75275083648fd9243c5bc212530355c76821c120 \
+        rmd160 225b3982f283c67f2370db3e72ec5e113230a8f6
 
 depends_lib	port:erlang
 depends_build	port:libxslt
diff -Naur --exclude=.svn macports/rabbitmq-server/Portfile-e rabbitmq/rabbitmq-server/Portfile-e
--- macports/rabbitmq-server/Portfile-e	2012-06-25 15:43:47.000000000 +0100
+++ rabbitmq/rabbitmq-server/Portfile-e	1970-01-01 01:00:00.000000000 +0100
@@ -1,123 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 92567 2012-05-01 15:38:32Z ryandesign@macports.org $
-
-PortSystem 1.0
-name		rabbitmq-server
-version		2.8.2
-categories	net 
-maintainers	paperplanes.de:meyer openmaintainer
-platforms	darwin
-supported_archs	noarch
-
-description	The RabbitMQ AMQP Server
-long_description	\
-    RabbitMQ is an implementation of AMQP, the emerging standard for \
-    high performance enterprise messaging. The RabbitMQ server is a \
-    robust and scalable implementation of an AMQP broker.
-
-
-homepage        http://www.rabbitmq.com/
-master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
-
-distfiles      ${name}-${version}${extract.suffix} \
-               ${name}-generic-unix-${version}${extract.suffix}
-
-checksums \
-    ${name}-${version}${extract.suffix} \
-        sha1 3d0da2996a30747c5875cfbf887c61d80d765ef4 \
-        rmd160 89509488902089d3c457dfcf3cc44a6b615b33cf \
-    ${name}-generic-unix-${version}${extract.suffix} \
-        sha1 b564d3277af5531f120bff822560b157432b2fa7 \
-        rmd160 b2e38f9163e05bc73fa793f6120c99940239a7f1
-
-depends_lib	port:erlang
-depends_build	port:libxslt
-
-platform darwin 8 {
-    depends_build-append port:py26-simplejson
-    build.args      PYTHON=${prefix}/bin/python2.6
-}
-platform darwin 9 {
-    depends_build-append port:py26-simplejson
-    build.args      PYTHON=${prefix}/bin/python2.6
-}
-# no need for simplejson on Snow Leopard or higher
-
-
-set serveruser  rabbitmq
-set servergroup rabbitmq
-set serverhome ${prefix}/var/lib/rabbitmq
-set logdir ${prefix}/var/log/rabbitmq
-set confdir ${prefix}/etc/rabbitmq
-set mnesiadbdir ${prefix}/var/lib/rabbitmq/mnesia
-set plistloc ${prefix}/etc/LaunchDaemons/org.macports.rabbitmq-server
-set sbindir ${destroot}${prefix}/lib/rabbitmq/bin
-set wrappersbin ${destroot}${prefix}/sbin
-set realsbin ${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version}/sbin
-set mansrc ${workpath}/rabbitmq_server-${version}/share/man
-set mandest ${destroot}${prefix}/share/man
-
-use_configure   no
-
-use_parallel_build yes
-
-build.env-append HOME=${workpath}
-
-build.env-append VERSION=${version}
-
-destroot.env-append VERSION=${version}
-
-destroot.target install_bin
-
-destroot.destdir \
-    TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \
-    SBIN_DIR=${sbindir} \
-    MAN_DIR=${destroot}${prefix}/share/man
-
-destroot.keepdirs \
-    ${destroot}${confdir} \
-    ${destroot}${logdir} \
-    ${destroot}${mnesiadbdir}
-
-pre-destroot {
-    addgroup ${servergroup}
-    adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}
-}
-
-post-destroot {
-    xinstall -d -m 775 ${destroot}${confdir}
-    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${logdir}
-    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${serverhome}
-    xinstall -d -g [existsgroup ${servergroup}] -m 775 ${destroot}${mnesiadbdir}
-
-    reinplace -E "s:^SYS_PREFIX=\${RABBITMQ_HOME}$:SYS_PREFIX=${prefix}:" \
-        ${realsbin}/rabbitmq-defaults
-    reinplace -E "s:^SYS_PREFIX=$:SYS_PREFIX=${prefix}:" \
-        ${realsbin}/rabbitmq-defaults
-
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmq-server
-    reinplace -E "s:@MACPORTS_PREFIX@:${prefix}:g" \
-                ${wrappersbin}/rabbitmq-server
-    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:g" \
-                ${wrappersbin}/rabbitmq-server
-    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:g" \
-                ${wrappersbin}/rabbitmq-server
-
-    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmqctl
-    file copy ${wrappersbin}/rabbitmq-server ${wrappersbin}/rabbitmq-plugins
-
-    xinstall -m 644 -W ${mansrc}/man1 rabbitmq-server.1.gz rabbitmqctl.1.gz rabbitmq-plugins.1.gz \
-        ${mandest}/man1/
-    xinstall -m 644 -W ${mansrc}/man5 rabbitmq-env.conf.5.gz ${mandest}/man5/
-}
-
-pre-install {
-    system "cd ${destroot}${plistloc}; patch <${filespath}/patch-org.macports.rabbitmq-server.plist.diff"
-}
-
-startupitem.create      yes
-startupitem.init        "PATH=${prefix}/bin:${prefix}/sbin:\$PATH; export PATH"
-startupitem.start       "rabbitmq-server 2>&1"
-startupitem.stop        "rabbitmqctl stop 2>&1"
-startupitem.logfile     ${prefix}/var/log/rabbitmq/startupitem.log
diff -Naur --exclude=.svn macports/rabbitmq-server/files/rabbitmq-script-wrapper rabbitmq/rabbitmq-server/files/rabbitmq-script-wrapper
--- macports/rabbitmq-server/files/rabbitmq-script-wrapper	2012-06-25 15:43:47.000000000 +0100
+++ rabbitmq/rabbitmq-server/files/rabbitmq-script-wrapper	2012-06-22 17:14:26.000000000 +0100
@@ -29,7 +29,9 @@
 
 SCRIPT=`basename $0`
 
-if [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
+if [ `id -u` = `id -u rabbitmq` -a "$SCRIPT" = "rabbitmq-server" ] ; then
+    /usr/lib/rabbitmq/bin/rabbitmq-server "$@" @STDOUT_STDERR_REDIRECTION@
+elif [ `id -u` = `id -u rabbitmq` -o "$SCRIPT" = "rabbitmq-plugins" ] ; then
     /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
 elif [ `id -u` = 0 ] ; then
     SHELL=/bin/sh HOME=/var/lib/rabbitmq USER=rabbitmq LOGNAME=rabbitmq PATH="$(eval `PATH=@MACPORTS_PREFIX@/bin /usr/libexec/path_helper -s`; echo $PATH)" su -m rabbitmq -c "/usr/lib/rabbitmq/bin/${SCRIPT} ${CMDLINE}"