diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
new file mode 100644
index 00000000000..ed51104973d
--- /dev/null
+++ b/mail/py-spf/Makefile
@@ -0,0 +1,39 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2008/10/18 11:15:36 ajacoutot Exp $
+
+COMMENT=	Sender-Policy-Framework queries in Python
+
+MODPY_EGG_VERSION=2.0.5
+DISTNAME=	pyspf-${MODPY_EGG_VERSION}
+PKGNAME=	py-spf-${MODPY_EGG_VERSION}
+CATEGORIES=	mail
+
+HOMEPAGE=	http://bmsi.com/python/milter.html
+
+MAINTAINER=	Pierre-Emmanuel Andre <pea@raveland.org>
+
+# Python
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pymilter/}
+
+MODULES=        lang/python
+
+BUILD_DEPENDS=	py-dns-*:net/py-dns
+
+REGRESS_DEPENDS=${PKGNAME}:${BUILD_PKGPATH} \
+		::textproc/py-yaml
+
+BINFILES=	spfquery.py type99.py
+
+do-regress:
+	@cd ${WRKSRC}/test && ${MODPY_BIN} testspf.py
+
+post-install:
+.for i in ${BINFILES}
+	@cd ${PREFIX}/bin && mv ${i} `basename ${i} .py`
+.endfor
+
+.include <bsd.port.mk>
diff --git a/mail/py-spf/distinfo b/mail/py-spf/distinfo
new file mode 100644
index 00000000000..38848489145
--- /dev/null
+++ b/mail/py-spf/distinfo
@@ -0,0 +1,5 @@
+MD5 (pyspf-2.0.5.tar.gz) = fj9TNi461S7IpJZEUIWjTw==
+RMD160 (pyspf-2.0.5.tar.gz) = g/pCVwv/vx7Bk02y1TT60fSzuMY=
+SHA1 (pyspf-2.0.5.tar.gz) = hAHpav5qFBokKG8kEI9Arc3TtPg=
+SHA256 (pyspf-2.0.5.tar.gz) = qeFD/vxrr9n245sbYuqq+ui/lr3CWWH/HVXQGxc78LA=
+SIZE (pyspf-2.0.5.tar.gz) = 38818
diff --git a/mail/py-spf/pkg/DESCR b/mail/py-spf/pkg/DESCR
new file mode 100644
index 00000000000..72d781b9116
--- /dev/null
+++ b/mail/py-spf/pkg/DESCR
@@ -0,0 +1,2 @@
+Sender-Policy-Framework queries in Python.
+Provides an implementation of SPF useful for detecting email forgery.
diff --git a/mail/py-spf/pkg/PLIST b/mail/py-spf/pkg/PLIST
new file mode 100644
index 00000000000..f898c652d04
--- /dev/null
+++ b/mail/py-spf/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2008/10/18 11:15:36 ajacoutot Exp $
+bin/spfquery
+bin/type99
+lib/python${MODPY_VERSION}/site-packages/pyspf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/spf.py
+lib/python${MODPY_VERSION}/site-packages/spf.pyc