diff --git a/mail/pop3proxy/Makefile b/mail/pop3proxy/Makefile
index 9abcaf2e1d7e..88771f954941 100644
--- a/mail/pop3proxy/Makefile
+++ b/mail/pop3proxy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pop3proxy
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://people.freebsd.org/~mbr/distfiles/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
@@ -17,25 +18,15 @@ COMMENT=	POP3 Proxy Server derived from UP IMAP Proxy
 
 GNU_CONFIGURE=	YES
 USE_AUTOTOOLS=	autoconf:213
-USE_RC_SUBR=	YES
+USE_RC_SUBR=	pop3proxyd
 
 SAMPLE_EXT=	sample
 
-.include <bsd.port.pre.mk>
-
-RC_SCRIPTS_SUB= PREFIX=${PREFIX} \
-		RC_SUBR=${RC_SUBR}
-
 post-install:
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pop3proxyd.conf > ${WRKSRC}/pop3proxyd.conf ;
 	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} ;
-	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		< ${FILESDIR}/pop3proxyd.sh > ${WRKSRC}/pop3proxyd.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/pop3proxyd.sh ${PREFIX}/etc/rc.d/pop3proxyd.sh
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/pop3proxy/files/patch-src_imapcommon.c b/mail/pop3proxy/files/patch-src_imapcommon.c
new file mode 100644
index 000000000000..978c95445091
--- /dev/null
+++ b/mail/pop3proxy/files/patch-src_imapcommon.c
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- src/imapcommon.c.orig
++++ src/imapcommon.c
+@@ -121,6 +121,7 @@
+ #include <errno.h>
+ 
+ #include <openssl/evp.h>
++#include <openssl/md5.h>
+ 
+ #include <pthread.h>
+ #include <sys/types.h>
diff --git a/mail/pop3proxy/files/pop3proxyd.sh b/mail/pop3proxy/files/pop3proxyd.in
similarity index 100%
rename from mail/pop3proxy/files/pop3proxyd.sh
rename to mail/pop3proxy/files/pop3proxyd.in
diff --git a/mail/pop3proxy/pkg-plist b/mail/pop3proxy/pkg-plist
index faa0ab35f94f..b3292cee9d51 100644
--- a/mail/pop3proxy/pkg-plist
+++ b/mail/pop3proxy/pkg-plist
@@ -1,4 +1,5 @@
 sbin/pop3proxystat
 sbin/pop3proxyd
-etc/rc.d/pop3proxyd.sh
+@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