diff --git a/print/epsonepl/Makefile b/print/epsonepl/Makefile
index 7b91fae18e9d..57c2c833a9d8 100644
--- a/print/epsonepl/Makefile
+++ b/print/epsonepl/Makefile
@@ -12,20 +12,21 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Printer filter for EPSON EPL-5700L etc
 
+LIB_DEPENDS=	libijs.so:${PORTSDIR}/print/libijs
+
+USES=		uidfix
 USE_GHOSTSCRIPT_RUN=	yes
 
-LIB_DEPENDS=	ijs.1:${PORTSDIR}/print/libijs
-
 MAKEFILE=	${FILESDIR}/Makefile
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-extract:
 	@cd ${WRKSRC} && ${LS} ijs* | ${GREP} -v ${PORTNAME} | ${XARGS} ${RM}
 
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${PREFIX}/etc
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.apsfilter ${DATADIR}
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${PKGMESSAGE}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \
+		${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.apsfilter ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/print/epsonepl/files/Makefile b/print/epsonepl/files/Makefile
index 41012fd94e9e..e43a6ac074d1 100644
--- a/print/epsonepl/files/Makefile
+++ b/print/epsonepl/files/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-DESTDIR=	${PREFIX}
-BINDIR=	/bin
+DESTDIR=
+BINDIR=	${PREFIX}/bin
 
 CFLAGS+=	-I${LOCALBASE}/include/ijs
 LDADD=	-L${LOCALBASE}/lib -lijs
diff --git a/print/epsonepl/pkg-message b/print/epsonepl/files/pkg-message.in
similarity index 84%
rename from print/epsonepl/pkg-message
rename to print/epsonepl/files/pkg-message.in
index 442892219773..e14a1f2085f4 100644
--- a/print/epsonepl/pkg-message
+++ b/print/epsonepl/files/pkg-message.in
@@ -4,6 +4,6 @@ You need to copy and customize
 %%PREFIX%%/etc/epsonepl.conf[.sample]
 
 If you're using apsfilter then have a look 
-at %%PREFIX%%/share/epsonepl/epsonepl.apsfilter
+at %%DATADIR%%/epsonepl.apsfilter
 
 -------------------------------------------------------------------------
diff --git a/print/epsonepl/pkg-plist b/print/epsonepl/pkg-plist
index c7f51a2098c8..42b80acc0f2c 100644
--- a/print/epsonepl/pkg-plist
+++ b/print/epsonepl/pkg-plist
@@ -1,5 +1,5 @@
 bin/ijs_server_epsonepl
 bin/ps2epl
 etc/epsonepl.conf.sample
-share/epsonepl/epsonepl.apsfilter
+%%DATADIR%%/epsonepl.apsfilter
 @dirrm share/epsonepl