diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile
index 49bb530fe351..38d257ebaefa 100644
--- a/textproc/py-rxp/Makefile
+++ b/textproc/py-rxp/Makefile
@@ -1,44 +1,38 @@
 # Ports collection makefile for:	py-rxp
 # Date created:		10 May 2002
 # Whom:			Hye-Shik Chang <perky@fallin.lv>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rxp
 PORTVERSION=	0.9
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	http://www.reportlab.com/ftp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyRXP-${PORTVERSION:S/./-/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast validating XML parser for Python
 
 NO_WRKSUBDIR=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	pyRXP
 PYDISTUTILS_PKGVERSION=	0.5
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-rxp
 DOCSDIR=	${PREFIX}/share/doc/py-rxp
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 900000
-BROKEN=		does not build
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/freebsd4/freebsd4", "freebsd5", "freebsd6", "freebsd7", "freebsd8/g' ${WRKSRC}/setup.py
-
 .if !defined(NOPORTDOCS)
 post-install:
 	@${MKDIR} ${EXAMPLESDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/py-rxp/files/patch-setup.py b/textproc/py-rxp/files/patch-setup.py
new file mode 100644
index 000000000000..533858906f3e
--- /dev/null
+++ b/textproc/py-rxp/files/patch-setup.py
@@ -0,0 +1,12 @@
+--- setup.py.orig	2012-02-10 14:58:50.000000000 +0800
++++ setup.py	2012-02-10 15:00:05.000000000 +0800
+@@ -25,7 +25,8 @@
+ 		LIBS=['nsl', 'socket', 'dl']
+ 	elif sys.platform=="aix4":
+ 		LIBS=['nsl_r', 'dl']
+-	elif sys.platform in ("freebsd4", "darwin", "mac", "linux2"):
++	elif sys.platform in ("freebsd4", "darwin", "mac", "linux2") \
++		or sys.platform.startswith("freebsd"):
+ 		LIBS=[]
+ 	else:
+ 		msg = "Don't know about system %s" % sys.platform