diff --git a/security/Makefile b/security/Makefile
index 4934879287ad..9c3bb9a02229 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -575,6 +575,7 @@
     SUBDIR += py-m2crypto
     SUBDIR += py-mcrypt
     SUBDIR += py-mhash
+    SUBDIR += py-openid
     SUBDIR += py-openssl
     SUBDIR += py-paramiko
     SUBDIR += py-posix1e
diff --git a/security/py-openid/Makefile b/security/py-openid/Makefile
new file mode 100644
index 000000000000..25aec06becb3
--- /dev/null
+++ b/security/py-openid/Makefile
@@ -0,0 +1,24 @@
+# Ports collection makefile for:	py-openid
+# Date created:				Dec 19, 2006
+# Whom:					Cheng-Lung Sung <clsung@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	openid
+PORTVERSION=	1.2.0
+CATEGORIES=	security python
+MASTER_SITES=	http://www.openidenabled.com/resources/downloads/python-openid/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	python-${PORTNAME}-${PORTVERSION}
+
+MAINTAINER=	clsung@FreeBSD.org
+COMMENT=	Python OpenID version
+
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urljr:${PORTSDIR}/www/py-urljr \
+		${PYTHON_SITELIBDIR}/yadis:${PORTSDIR}/net/py-yadis
+
+USE_PYTHON=	yes
+USE_PYDISTUTILS=yes
+
+.include <bsd.port.mk>
diff --git a/security/py-openid/distinfo b/security/py-openid/distinfo
new file mode 100644
index 000000000000..2230ce9eb7f5
--- /dev/null
+++ b/security/py-openid/distinfo
@@ -0,0 +1,3 @@
+MD5 (python-openid-1.2.0.tar.gz) = 4ad16ef790d80a965b902eb315fe57b2
+SHA256 (python-openid-1.2.0.tar.gz) = a2503296bc860ae47c118544d81967fff83028e9bbd7373ea4f67acffe456f82
+SIZE (python-openid-1.2.0.tar.gz) = 333299
diff --git a/security/py-openid/pkg-descr b/security/py-openid/pkg-descr
new file mode 100644
index 000000000000..510facd54380
--- /dev/null
+++ b/security/py-openid/pkg-descr
@@ -0,0 +1,11 @@
+Python OpenID library implements recent changes to the OpenID 
+specification as well as making API changes that should make 
+integration with applications easier.
+
+This library allows the use of XRI as OpenID identifiers, allowing users 
+to log in with their i-names.  For full XRI compatibility,
+relying parties integrating this library should take note of the user's
+CanonicalID, as described in the "Identifying the End User" section of 
+the OpenID 2.0 specification.
+
+WWW: http://www.openidenabled.com/openid/libraries/python/
diff --git a/security/py-openid/pkg-plist b/security/py-openid/pkg-plist
new file mode 100644
index 000000000000..2bfeb9ab9e2a
--- /dev/null
+++ b/security/py-openid/pkg-plist
@@ -0,0 +1,58 @@
+%%PYTHON_SITELIBDIR%%/openid/__init__.py
+%%PYTHON_SITELIBDIR%%/openid/__init__.pyc
+%%PYTHON_SITELIBDIR%%/openid/__init__.pyo
+%%PYTHON_SITELIBDIR%%/openid/association.py
+%%PYTHON_SITELIBDIR%%/openid/association.pyc
+%%PYTHON_SITELIBDIR%%/openid/association.pyo
+%%PYTHON_SITELIBDIR%%/openid/consumer/__init__.py
+%%PYTHON_SITELIBDIR%%/openid/consumer/__init__.pyc
+%%PYTHON_SITELIBDIR%%/openid/consumer/__init__.pyo
+%%PYTHON_SITELIBDIR%%/openid/consumer/consumer.py
+%%PYTHON_SITELIBDIR%%/openid/consumer/consumer.pyc
+%%PYTHON_SITELIBDIR%%/openid/consumer/consumer.pyo
+%%PYTHON_SITELIBDIR%%/openid/consumer/discover.py
+%%PYTHON_SITELIBDIR%%/openid/consumer/discover.pyc
+%%PYTHON_SITELIBDIR%%/openid/consumer/discover.pyo
+%%PYTHON_SITELIBDIR%%/openid/consumer/parse.py
+%%PYTHON_SITELIBDIR%%/openid/consumer/parse.pyc
+%%PYTHON_SITELIBDIR%%/openid/consumer/parse.pyo
+%%PYTHON_SITELIBDIR%%/openid/cryptutil.py
+%%PYTHON_SITELIBDIR%%/openid/cryptutil.pyc
+%%PYTHON_SITELIBDIR%%/openid/cryptutil.pyo
+%%PYTHON_SITELIBDIR%%/openid/dh.py
+%%PYTHON_SITELIBDIR%%/openid/dh.pyc
+%%PYTHON_SITELIBDIR%%/openid/dh.pyo
+%%PYTHON_SITELIBDIR%%/openid/kvform.py
+%%PYTHON_SITELIBDIR%%/openid/kvform.pyc
+%%PYTHON_SITELIBDIR%%/openid/kvform.pyo
+%%PYTHON_SITELIBDIR%%/openid/oidutil.py
+%%PYTHON_SITELIBDIR%%/openid/oidutil.pyc
+%%PYTHON_SITELIBDIR%%/openid/oidutil.pyo
+%%PYTHON_SITELIBDIR%%/openid/server/__init__.py
+%%PYTHON_SITELIBDIR%%/openid/server/__init__.pyc
+%%PYTHON_SITELIBDIR%%/openid/server/__init__.pyo
+%%PYTHON_SITELIBDIR%%/openid/server/server.py
+%%PYTHON_SITELIBDIR%%/openid/server/server.pyc
+%%PYTHON_SITELIBDIR%%/openid/server/server.pyo
+%%PYTHON_SITELIBDIR%%/openid/server/trustroot.py
+%%PYTHON_SITELIBDIR%%/openid/server/trustroot.pyc
+%%PYTHON_SITELIBDIR%%/openid/server/trustroot.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/__init__.py
+%%PYTHON_SITELIBDIR%%/openid/store/__init__.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/__init__.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/dumbstore.py
+%%PYTHON_SITELIBDIR%%/openid/store/dumbstore.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/dumbstore.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/filestore.py
+%%PYTHON_SITELIBDIR%%/openid/store/filestore.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/filestore.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/interface.py
+%%PYTHON_SITELIBDIR%%/openid/store/interface.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/interface.pyo
+%%PYTHON_SITELIBDIR%%/openid/store/sqlstore.py
+%%PYTHON_SITELIBDIR%%/openid/store/sqlstore.pyc
+%%PYTHON_SITELIBDIR%%/openid/store/sqlstore.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/openid/store
+@dirrm %%PYTHON_SITELIBDIR%%/openid/server
+@dirrm %%PYTHON_SITELIBDIR%%/openid/consumer
+@dirrm %%PYTHON_SITELIBDIR%%/openid