diff --git a/net/ssltunnel-server/Makefile b/net/ssltunnel-server/Makefile
index c3d98026cdc0..18eeb8e74f4c 100644
--- a/net/ssltunnel-server/Makefile
+++ b/net/ssltunnel-server/Makefile
@@ -17,18 +17,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 OPTIONS_DEFINE=	TCPWRAPPERS DOCS
 TCPWRAPPERS_DESC=	libwrap support
 
+TCPWRAPPERS_CONFIGURE_ON=	--with-libwrap
+
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-client
 USE_OPENSSL=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCPWRAPPERS}
-CONFIGURE_ARGS+=--with-libwrap
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's^#include <utmp.h>^/*utmp.h not for FreeBSD*/^' \
 		${WRKSRC}/server/main.c \
@@ -40,6 +36,7 @@ post-patch:
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MV} ${STAGEDIR}${ETCDIR}/tunnel.conf.default ${STAGEDIR}${ETCDIR}/tunnel.conf.sample
 	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/server.README
 	${INSTALL_MAN} ${WRKSRC}/LISEZ-MOI ${STAGEDIR}${DOCSDIR}/server.LISEZ-MOI
 	${INSTALL_DATA} ${WRKSRC}/server/users.new ${STAGEDIR}${ETCDIR}/users.sample
diff --git a/net/ssltunnel-server/pkg-plist b/net/ssltunnel-server/pkg-plist
index 7068b53f5d16..c28f6c676490 100644
--- a/net/ssltunnel-server/pkg-plist
+++ b/net/ssltunnel-server/pkg-plist
@@ -1,6 +1,5 @@
-@unexec if cmp -s %D/%%ETCDIR%%/tunnel.conf %D/%%ETCDIR%%/tunnel.conf.default; then rm -f %D/%%ETCDIR%%/tunnel.conf; fi
 @unexec if cmp -s %D/%%ETCDIR%%/users %D/%%ETCDIR%%/users.sample; then rm -f %D/%%ETCDIR%%/users; fi
-%%ETCDIR%%/tunnel.conf.default
+@sample %%ETCDIR%%/tunnel.conf.sample
 %%ETCDIR%%/users.sample
 libexec/pppserver
 sbin/pppwho