diff --git a/net/Makefile b/net/Makefile
index 127474beec71..022017f034b3 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -879,6 +879,7 @@
     SUBDIR += pvm++
     SUBDIR += pxe
     SUBDIR += py-GeoIP
+    SUBDIR += py-amqp
     SUBDIR += py-amqplib
     SUBDIR += py-avahi
     SUBDIR += py-pybeanstalk
diff --git a/net/py-amqp/Makefile b/net/py-amqp/Makefile
new file mode 100644
index 000000000000..6add8ec7d14c
--- /dev/null
+++ b/net/py-amqp/Makefile
@@ -0,0 +1,18 @@
+# Created by: Kubilay Kocak <koobs.freebsd@gmail.com>
+# $FreeBSD$
+
+PORTNAME=	amqp
+PORTVERSION=	0.9.3
+CATEGORIES=	net python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	koobs.freebsd@gmail.com
+COMMENT=	Low-level AMQP client for Python (fork of amqplib)
+
+LICENSE=	LGPL21
+
+USE_PYTHON=	yes
+USE_PYDISTUTILS=	easy_install
+
+.include <bsd.port.mk>
diff --git a/net/py-amqp/distinfo b/net/py-amqp/distinfo
new file mode 100644
index 000000000000..3955698a2cf1
--- /dev/null
+++ b/net/py-amqp/distinfo
@@ -0,0 +1,2 @@
+SHA256 (amqp-0.9.3.tar.gz) = ff7080df6c634c3f1eaaf4443efb9d012d2e1c5821773b108cf9915d6aa724be
+SIZE (amqp-0.9.3.tar.gz) = 57761
diff --git a/net/py-amqp/pkg-descr b/net/py-amqp/pkg-descr
new file mode 100644
index 000000000000..2dbc8e0c41f7
--- /dev/null
+++ b/net/py-amqp/pkg-descr
@@ -0,0 +1,7 @@
+This is a fork of amqplib which was originally written by Barry Pederson. It
+is maintained by the Celery project, and used by kombu as a pure python
+alternative when librabbitmq is not available.
+
+This library should be API compatible with librabbitmq.
+
+WWW:	http://github.com/celery/py-amqp
diff --git a/net/py-amqp/pkg-plist b/net/py-amqp/pkg-plist
new file mode 100644
index 000000000000..0fab0026d3e4
--- /dev/null
+++ b/net/py-amqp/pkg-plist
@@ -0,0 +1,36 @@
+@comment $FreeBSD$
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/abstract_channel.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/abstract_channel.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/abstract_channel.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/basic_message.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/basic_message.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/basic_message.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/channel.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/channel.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/channel.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/connection.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/connection.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/connection.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/method_framing.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/method_framing.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/method_framing.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/serialization.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/serialization.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/serialization.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/transport.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/transport.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp/transport.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/amqp
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%