diff --git a/MANIFEST.in b/MANIFEST.in
index c5b53960..35c0ac82 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -9,7 +9,7 @@ include README
 include THANKS
 include TODO
 include setup.cfg
-recursive-include contrib *
+recursive-include extra *
 recursive-include docs *
 recursive-include kombu *.py
 recursive-include requirements *.txt
diff --git a/docs/reference/kombu.utils.amq_manager.rst b/docs/reference/kombu.utils.amq_manager.rst
new file mode 100644
index 00000000..13e191eb
--- /dev/null
+++ b/docs/reference/kombu.utils.amq_manager.rst
@@ -0,0 +1,11 @@
+====================================================
+ Generic RabbitMQ manager - kombu.utils.amq_manager
+====================================================
+
+.. contents::
+    :local:
+.. currentmodule:: kombu.utils.amq_manager
+
+.. automodule:: kombu.utils.amq_manager
+    :members:
+    :undoc-members:
diff --git a/contrib/doc2ghpages b/extra/doc2ghpages
similarity index 100%
rename from contrib/doc2ghpages
rename to extra/doc2ghpages
diff --git a/contrib/release/bump_version.py b/extra/release/bump_version.py
similarity index 100%
rename from contrib/release/bump_version.py
rename to extra/release/bump_version.py
diff --git a/contrib/release/doc4allmods b/extra/release/doc4allmods
similarity index 100%
rename from contrib/release/doc4allmods
rename to extra/release/doc4allmods
diff --git a/contrib/release/flakeplus.py b/extra/release/flakeplus.py
similarity index 100%
rename from contrib/release/flakeplus.py
rename to extra/release/flakeplus.py
diff --git a/contrib/release/jython-run-tests b/extra/release/jython-run-tests
similarity index 100%
rename from contrib/release/jython-run-tests
rename to extra/release/jython-run-tests
diff --git a/contrib/release/removepyc.sh b/extra/release/removepyc.sh
similarity index 100%
rename from contrib/release/removepyc.sh
rename to extra/release/removepyc.sh
diff --git a/contrib/release/verify-reference-index.sh b/extra/release/verify-reference-index.sh
similarity index 100%
rename from contrib/release/verify-reference-index.sh
rename to extra/release/verify-reference-index.sh
diff --git a/contrib/requirements b/extra/requirements
similarity index 100%
rename from contrib/requirements
rename to extra/requirements
diff --git a/pavement.py b/pavement.py
index 22917080..a51cca73 100644
--- a/pavement.py
+++ b/pavement.py
@@ -63,12 +63,12 @@ def upload_docs(options):
 
 @task
 def autodoc(options):
-    sh("contrib/release/doc4allmods kombu")
+    sh("extra/release/doc4allmods kombu")
 
 
 @task
 def verifyindex(options):
-    sh("contrib/release/verify-reference-index.sh")
+    sh("extra/release/verify-reference-index.sh")
 
 
 @task
@@ -80,7 +80,7 @@ def clean_readme(options):
 @task
 @needs("clean_readme")
 def readme(options):
-    sh("python contrib/release/sphinx-to-rst.py docs/templates/readme.txt \
+    sh("python extra/release/sphinx-to-rst.py docs/templates/readme.txt \
             > README.rst")
     sh("ln -sf README.rst README")
 
@@ -92,7 +92,7 @@ def readme(options):
 def bump(options):
     s = "-- '%s'" % (options.custom, ) \
             if getattr(options, "custom", None) else ""
-    sh("contrib/release/bump_version.py \
+    sh("extra/release/bump_version.py \
             kombu/__init__.py README.rst %s" % (s, ))
 
 
@@ -135,7 +135,7 @@ def flake8(options):
 ])
 def flakeplus(options):
     noerror = getattr(options, "noerror", False)
-    sh("python contrib/release/flakeplus.py kombu",
+    sh("python extra/release/flakeplus.py kombu",
        ignore_error=noerror)
 
 
diff --git a/tox.ini b/tox.ini
index ef8d05f4..d7ea538d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,7 +12,7 @@ recreate = True
 basepython = python3.2
 changedir = .tox
 deps = -r{toxinidir}/requirements/default.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
                 --download-cache={toxworkdir}/_download         \
@@ -39,7 +39,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3  --cover3-xml             \
@@ -50,7 +50,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                               \
                      --xunit-file={toxinidir}/nosetests.xml     \
                      --with-coverage3  --cover3-xml             \
@@ -61,7 +61,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 basepython = python2.5
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                           \
                      --xunit-file={toxinidir}/nosetests.xml \
                      --with-coverage3 --cover3-xml          \
@@ -72,7 +72,7 @@ commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-pypy.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            nosetests --with-xunit                           \
                      --xunit-file={toxinidir}/nosetests.xml \
                      --with-coverage3 --cover3-xml          \
@@ -85,5 +85,5 @@ recreate = True
 where = .tox
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test-jython.txt
-commands = {toxinidir}/contrib/release/removepyc.sh {toxinidir}
-           {toxinidir}/contrib/release/jython-run-tests {toxinidir}
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
+           {toxinidir}/extra/release/jython-run-tests {toxinidir}