diff --git a/devel/py-setproctitle/Makefile b/devel/py-setproctitle/Makefile
index 00672402ae1..2a2d0b708bb 100644
--- a/devel/py-setproctitle/Makefile
+++ b/devel/py-setproctitle/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/12/19 10:37:41 mpi Exp $
+# $OpenBSD: Makefile,v 1.2 2012/04/17 13:00:43 mpi Exp $
 
 COMMENT =		library for getting/setting process names
 
-MODPY_EGG_VERSION=	1.1.3
+MODPY_EGG_VERSION=	1.1.5
 DISTNAME =		setproctitle-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 
@@ -22,6 +22,9 @@ MASTER_SITES=		${MASTER_SITE_PYPI:=s/setproctitle/}
 
 MODULES =		lang/python
 
+FLAVORS =		python3
+FLAVOR ?=
+
 WANTLIB +=		${MODPY_WANTLIB}
 
 BUILD_DIR =		build/lib.${MODPY_VERSION}
@@ -29,10 +32,10 @@ MODPY_DISTUTILS_BUILDARGS = --build-lib ${BUILD_DIR}
 
 REGRESS_DEPENDS =	devel/gmake
 
-MAKE_ENV +=		PYTHON="${MODPY_BIN}" PYCONFIG="${MODPY_BIN}-config"
+MAKE_ENV +=		PYTHON="${MODPY_BIN}" PYCONFIG="${MODPY_BIN}-config" \
+			PY2TO3="2to3-${MODPY_VERSION}"
 
 do-regress:
-	cd ${WRKSRC} && gmake ${MAKE_ENV} tests/pyrun && \
-	PYTHONPATH=${BUILD_DIR} ${MODPY_BIN} tests/setproctitle_test.py
+	cd ${WRKSRC} && gmake ${MAKE_ENV} check
 
 .include <bsd.port.mk>
diff --git a/devel/py-setproctitle/distinfo b/devel/py-setproctitle/distinfo
index a8deda958fb..60f1c265afe 100644
--- a/devel/py-setproctitle/distinfo
+++ b/devel/py-setproctitle/distinfo
@@ -1,5 +1,5 @@
-MD5 (setproctitle-1.1.3.tar.gz) = ZAKFIYUNxoxbkNRTd94/XA==
-RMD160 (setproctitle-1.1.3.tar.gz) = ZGFBQZmOS1MVB4d4p1b2JK4g5CY=
-SHA1 (setproctitle-1.1.3.tar.gz) = efUzcaNwfXMojxcDjeepfuAzuFY=
-SHA256 (setproctitle-1.1.3.tar.gz) = Svl+sBov67gQoItG9/U7Rgwe2mvroHiVwT6+dW9CIwY=
-SIZE (setproctitle-1.1.3.tar.gz) = 19286
+MD5 (setproctitle-1.1.5.tar.gz) = jcI2wjcnpKygMfzSm3+Kcw==
+RMD160 (setproctitle-1.1.5.tar.gz) = ycs2DpTxwBqma4SnvfhR4kpBjbI=
+SHA1 (setproctitle-1.1.5.tar.gz) = AH4b9Av5URvaLS+J44KX/pY0HvQ=
+SHA256 (setproctitle-1.1.5.tar.gz) = xDRkVBKlVvckyP/lVaLptYfNESdCamHJh5SvI0eD9Fg=
+SIZE (setproctitle-1.1.5.tar.gz) = 22382
diff --git a/devel/py-setproctitle/patches/patch-Makefile b/devel/py-setproctitle/patches/patch-Makefile
new file mode 100644
index 00000000000..32f0700c6fe
--- /dev/null
+++ b/devel/py-setproctitle/patches/patch-Makefile
@@ -0,0 +1,27 @@
+$OpenBSD: patch-Makefile,v 1.1 2012/04/17 13:00:43 mpi Exp $
+
+Copy missing file for python3 flavor and remove non supported cp option.
+
+--- Makefile.orig	Mon Feb  6 13:49:36 2012
++++ Makefile	Sun Apr  8 15:58:50 2012
+@@ -29,7 +29,7 @@
+ check: build tests/pyrun2
+ 	PYTHONPATH=`pwd`/$(BUILD_DIR):$$PYTHONPATH \
+ 	ROOT_PATH=$(ROOT_PATH) \
+-	$(PYTHON) `which nosetests` -v -s -w tests
++	$(PYTHON) tests/setproctitle_test.py -v
+ 
+ tests/pyrun2: tests/pyrun.c
+ 	$(CC) $(PYINC) -o $@ $< $(PYLIB)
+@@ -48,9 +48,10 @@
+ 	$(MKDIR) py3
+ 	$(MKDIR) py3/src
+ 	$(MKDIR) py3/tests
+-	for f in `grep -v "#" MANIFEST`; do cp -v $$f py3/$$f; done
++	for f in `grep -v "#" MANIFEST`; do cp $$f py3/$$f; done
+ 	# setup.py should be executable with python3 as distribute
+ 	# currenlty doesn't seem to try to convert it
++	cp tests/setproctitle_test.py py3/tests
+ 	$(PY2TO3) -w --no-diffs py3/tests
+ 
+ tests/pyrun3: tests/pyrun.c