diff -Naur --exclude=.svn macports/rabbitmq-server/Portfile rabbitmq/rabbitmq-server/Portfile
--- macports/rabbitmq-server/Portfile	2010-11-30 14:07:01.000000000 +0000
+++ rabbitmq/rabbitmq-server/Portfile	2010-11-30 11:00:21.000000000 +0000
@@ -3,12 +3,10 @@
 
 PortSystem 1.0
 name		rabbitmq-server
-version		2.1.1
+version		2.2.0
 categories	net 
 maintainers	paperplanes.de:meyer rabbitmq.com:tonyg openmaintainer
 platforms	darwin
-supported_archs	noarch
-
 description	The RabbitMQ AMQP Server
 long_description	\
     RabbitMQ is an implementation of AMQP, the emerging standard for \
@@ -19,19 +17,31 @@
 homepage        http://www.rabbitmq.com/
 master_sites    http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/
 
-checksums       sha1 d60bc55f819a56bef00b0bfafd12f707fc985301 \
-                rmd160 41d312dd934d017d492f2d1ccecdc9bd428e8a8a
+distfiles      ${name}-${version}${extract.suffix} \
+               ${name}-generic-unix-${version}${extract.suffix}
+
+checksums \
+    ${name}-${version}${extract.suffix} md5 65d0644aa4bf24398d13553b6aa6465f \
+    ${name}-${version}${extract.suffix} sha1 1f426dbc7961a0eac3864e57e623474bf8c46d74 \
+    ${name}-${version}${extract.suffix} rmd160 7912a9374726cb3d71b09e3ac47f35a2db2c3b1c \
+    ${name}-generic-unix-${version}${extract.suffix} md5 18b94e2bc4ef649bb9682e14283ecd5f \
+    ${name}-generic-unix-${version}${extract.suffix} sha1 40d35c4f1c0efd4fb83a8426fce7d8498efd12dc \
+    ${name}-generic-unix-${version}${extract.suffix} rmd160 c44d631c34e0fc92758396ce514077ab231c0ed2
 
 depends_lib	port:erlang
-depends_build	port:xmlto port:libxslt
+depends_build	port:libxslt
 
+platform darwin 7 {
+    depends_build-append port:py25-simplejson
+    build.args      PYTHON=${prefix}/bin/python2.5
+}
 platform darwin 8 {
-    depends_build-append port:py26-simplejson
-    build.args      PYTHON=${prefix}/bin/python2.6
+    depends_build-append port:py25-simplejson
+    build.args      PYTHON=${prefix}/bin/python2.5
 }
 platform darwin 9 {
-    depends_build-append port:py26-simplejson
-    build.args      PYTHON=${prefix}/bin/python2.6
+    depends_build-append port:py25-simplejson
+    build.args      PYTHON=${prefix}/bin/python2.5
 }
 # no need for simplejson on Snow Leopard or higher
 
@@ -45,11 +55,15 @@
 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
 
+destroot.target install_bin
+
 destroot.destdir \
     TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \
     SBIN_DIR=${sbindir} \
@@ -71,7 +85,7 @@
 
     reinplace -E "s:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
         ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE CLUSTER_CONFIG_FILE LOG_BASE MNESIA_BASE PIDS_FILE} {
+    foreach var {CONFIG_FILE LOG_BASE MNESIA_BASE PIDS_FILE} {
         reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
             ${realsbin}/rabbitmq-multi \
             ${realsbin}/rabbitmq-server \
@@ -89,6 +103,11 @@
                 ${wrappersbin}/rabbitmq-multi
     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
     file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
+
+    file copy ${mansrc}/man1/rabbitmq-multi.1.gz  ${mandest}/man1/
+    file copy ${mansrc}/man1/rabbitmq-server.1.gz ${mandest}/man1/
+    file copy ${mansrc}/man1/rabbitmqctl.1.gz     ${mandest}/man1/
+    file copy ${mansrc}/man5/rabbitmq.conf.5.gz   ${mandest}/man5/
 }
 
 pre-install {
diff -Naur --exclude=.svn macports/rabbitmq-server/Portfile-e rabbitmq/rabbitmq-server/Portfile-e
--- macports/rabbitmq-server/Portfile-e	2010-11-30 14:07:00.000000000 +0000
+++ rabbitmq/rabbitmq-server/Portfile-e	1970-01-01 01:00:00.000000000 +0100
@@ -1,102 +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 73760 2010-11-24 10:49:47Z jmr@macports.org $
-
-PortSystem 1.0
-name		rabbitmq-server
-version		2.1.1
-categories	net 
-maintainers	paperplanes.de:meyer rabbitmq.com:tonyg 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}/
-
-checksums       sha1 d60bc55f819a56bef00b0bfafd12f707fc985301 \
-                rmd160 41d312dd934d017d492f2d1ccecdc9bd428e8a8a
-
-depends_lib	port:erlang
-depends_build	port:xmlto 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 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
-
-use_configure   no
-
-use_parallel_build yes
-
-destroot.destdir \
-    TARGET_DIR=${destroot}${prefix}/lib/rabbitmq/lib/rabbitmq_server-${version} \
-    SBIN_DIR=${sbindir} \
-    MAN_DIR=${destroot}${prefix}/share/man
-
-destroot.keepdirs \
-    ${destroot}${logdir} \
-    ${destroot}${mnesiadbdir}
-
-pre-destroot {
-    addgroup ${servergroup}
-    adduser ${serveruser} gid=[existsgroup ${servergroup}] realname=RabbitMQ\ Server home=${serverhome}
-}
-
-post-destroot {
-    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:(/etc/rabbitmq/rabbitmq.conf):${prefix}\\1:g" \
-        ${realsbin}/rabbitmq-env
-    foreach var {CONFIG_FILE CLUSTER_CONFIG_FILE LOG_BASE MNESIA_BASE PIDS_FILE} {
-        reinplace -E "s:^($var)=/:\\1=${prefix}/:" \
-            ${realsbin}/rabbitmq-multi \
-            ${realsbin}/rabbitmq-server \
-            ${realsbin}/rabbitmqctl
-    }
-
-    xinstall -m 555 ${filespath}/rabbitmq-script-wrapper \
-                ${wrappersbin}/rabbitmq-multi
-
-    reinplace -E "s:MACPORTS_PREFIX/bin:${prefix}/bin:" \
-                ${wrappersbin}/rabbitmq-multi
-    reinplace -E "s:/usr/lib/rabbitmq/bin/:${prefix}/lib/rabbitmq/bin/:" \
-                ${wrappersbin}/rabbitmq-multi
-    reinplace -E "s:/var/lib/rabbitmq:${prefix}/var/lib/rabbitmq:" \
-                ${wrappersbin}/rabbitmq-multi
-    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmq-server
-    file copy ${wrappersbin}/rabbitmq-multi ${wrappersbin}/rabbitmqctl
-}
-
-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-asroot-script-wrapper rabbitmq/rabbitmq-server/files/rabbitmq-asroot-script-wrapper
--- macports/rabbitmq-server/files/rabbitmq-asroot-script-wrapper	2010-11-30 14:07:00.000000000 +0000
+++ rabbitmq/rabbitmq-server/files/rabbitmq-asroot-script-wrapper	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-#!/bin/sh
-##   The contents of this file are subject to the Mozilla Public License
-##   Version 1.1 (the "License"); you may not use this file except in
-##   compliance with the License. You may obtain a copy of the License at
-##   http://www.mozilla.org/MPL/
-##
-##   Software distributed under the License is distributed on an "AS IS"
-##   basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-##   License for the specific language governing rights and limitations
-##   under the License.
-##
-##   The Original Code is RabbitMQ.
-##
-##   The Initial Developers of the Original Code are LShift Ltd,
-##   Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
-##   Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
-##   are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
-##   Technologies LLC, and Rabbit Technologies Ltd.
-##
-##   Portions created by LShift Ltd are Copyright (C) 2007-2010 LShift
-##   Ltd. Portions created by Cohesive Financial Technologies LLC are
-##   Copyright (C) 2007-2010 Cohesive Financial Technologies
-##   LLC. Portions created by Rabbit Technologies Ltd are Copyright
-##   (C) 2007-2010 Rabbit Technologies Ltd.
-##
-##   All Rights Reserved.
-##
-##   Contributor(s): ______________________________________.
-##
-
-cd /var/lib/rabbitmq
-
-SCRIPT=`basename $0`
-
-if [ `id -u` = 0 ] ; then
-    /usr/lib/rabbitmq/bin/${SCRIPT} "$@"
-else
-    echo
-    echo "Only root should run ${SCRIPT}"
-    echo
-    exit 1
-fi
-