diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 6015dd2e612e..5eeb74e6f52c 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -13,6 +13,8 @@ EXTRACT_SUFX=	.c.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 
+RUN_DEPENDS=	XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server
+
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
@@ -21,12 +23,10 @@ do-extract:
 	${GUNZIP_CMD} -c ${_DISTDIR}${DISTFILES} > ${WRKSRC}/wrapper.c
 
 do-build:
-	${CC} -o ${WRKDIR}/Xwrapper ${WRKDIR}/wrapper.c
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o Xwrapper wrapper.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper ${PREFIX}/bin/
-	${LN} -sf ${PREFIX}/bin/Xwrapper ${PREFIX}/bin/X
-	${CHMOD} -s ${PREFIX}/bin/XFree86
-	${CHMOD} +s ${PREFIX}/bin/Xwrapper
+	${INSTALL_PROGRAM} ${WRKSRC}/Xwrapper ${PREFIX}/bin
+	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/x11/wrapper/pkg-install b/x11/wrapper/pkg-install
new file mode 100644
index 000000000000..049b7ca7d8b8
--- /dev/null
+++ b/x11/wrapper/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "X$2" != "XPOST-INSTALL" ]; then
+    exit 0
+fi
+
+/bin/ln -sf ${PKG_PREFIX}/bin/Xwrapper ${PKG_PREFIX}/bin/X
+/bin/chmod -s ${PKG_PREFIX}/bin/XFree86
+/bin/chmod +s ${PKG_PREFIX}/bin/Xwrapper