diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index 1985a187d27a..b42cf1077ea7 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -11,18 +11,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POP3 Proxy Server derived from UP IMAP Proxy
 
-GNU_CONFIGURE=	YES
+GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf213
 USE_RC_SUBR=	pop3proxyd
 
-SAMPLE_EXT=	sample
-
-NO_STAGE=	yes
-post-install:
-	if [ ! -f ${PREFIX}/etc/pop3proxyd.conf ]; then \
-		${INSTALL} -c ${WRKSRC}/pop3proxyd.conf ${PREFIX}/etc/pop3proxyd.conf ; \
-	fi
-	${INSTALL} -c ${WRKSRC}/pop3proxyd.conf ${PREFIX}/etc/pop3proxyd.conf.${SAMPLE_EXT} ;
-	@${CAT} ${PKGMESSAGE}
+do-install:
+	(cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} pop3proxystat pop3proxyd \
+		${STAGEDIR}${PREFIX}/sbin)
+	${INSTALL} -c ${WRKSRC}/pop3proxyd.conf \
+		${STAGEDIR}${PREFIX}/etc/pop3proxyd.conf.sample
 
 .include <bsd.port.mk>
diff --git a/mail/pop3proxy/pkg-plist b/mail/pop3proxy/pkg-plist
index b3292cee9d51..eae67d99f282 100644
--- a/mail/pop3proxy/pkg-plist
+++ b/mail/pop3proxy/pkg-plist
@@ -1,5 +1,3 @@
 sbin/pop3proxystat
 sbin/pop3proxyd
-@unexec if cmp -s %D/etc/pop3proxyd.conf.sample %D/etc/pop3proxyd.conf; then rm -f %D/etc/pop3proxyd.conf; fi
-etc/pop3proxyd.conf.sample
-@exec if [ ! -f %D/etc/pop3proxyd.conf ] ; then cp -p %D/%F %B/pop3proxyd.conf; fi
+@sample etc/pop3proxyd.conf.sample