diff --git a/textproc/rxp/Makefile b/textproc/rxp/Makefile
index 67e4f0ea9427..a87bf9011adc 100644
--- a/textproc/rxp/Makefile
+++ b/textproc/rxp/Makefile
@@ -7,22 +7,17 @@ CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cogsci.ed.ac.uk/pub/richard/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A validating XML parser written in C
-
-MAN1=	rxp.1
+COMMENT=	Validating XML parser written in C
 
 RXP_HEADERS=	charset.h ctype16.h dtd.h hash.h input.h namespaces.h \
 		rxputil.h stdio16.h string16.h system.h url.h version.h \
 		xmlparser.h
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rxp ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/librxp.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/rxp.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/include/rxp
-.for h in ${RXP_HEADERS}
-	${INSTALL_DATA} ${WRKSRC}/${h} ${PREFIX}/include/rxp
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/rxp ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/librxp.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_MAN} ${WRKSRC}/rxp.1 ${STAGEDIR}${PREFIX}/man/man1
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/rxp
+	${INSTALL_DATA} ${RXP_HEADERS:S,^,${WRKSRC}/,} ${STAGEDIR}${PREFIX}/include/rxp
 
 .include <bsd.port.mk>
diff --git a/textproc/rxp/pkg-plist b/textproc/rxp/pkg-plist
index 9a5bf5da2fbd..cb589b2b399d 100644
--- a/textproc/rxp/pkg-plist
+++ b/textproc/rxp/pkg-plist
@@ -13,4 +13,5 @@ include/rxp/system.h
 include/rxp/url.h
 include/rxp/version.h
 include/rxp/xmlparser.h
+man/man1/rxp.1.gz
 @dirrm include/rxp