diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index 7083692cda76..4e86d296a64d 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,52 +1,42 @@
 # Created by: Joe Clarke
 # $FreeBSD$
 
 PORTNAME=	openslp
 PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/OpenSLP/${PORTVERSION}
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Open-source implementation of the Service Location Protocol
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		libtool
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/openslp \
 		--localstatedir=/var
 
 USE_RC_SUBR=	slpd
 
 OPTIONS_DEFINE=	SLP_SECURITY ASYNC_API DOCS
 SLP_SECURITY_DESC=	Turn on SLPv2 security support
 ASYNC_API_DESC=		Enable asynchronous communication API
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSLP_SECURITY}
-CONFIGURE_ARGS+=	--enable-slpv2-security
-.endif
-
-.if ${PORT_OPTIONS:MASYNC_API}
-CONFIGURE_ARGS+=	--enable-async-api
-.endif
+SLP_SECURITY_CONFIGURE_ENABLE=	slpv2-security
+ASYNC_API_CONFIGURE_ENABLE=	async-api
 
 post-extract:
 	@(cd ${WRKSRC}; \
 		${FIND} doc -type f -path '*/CVS/*' -delete; \
 		${FIND} doc -type d -name CVS -delete)
 
 post-install:
 .for FILE in slp.conf slp.reg slp.spi
-	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${STAGEDIR}${PREFIX}/etc/openslp/${FILE}.default
+	${INSTALL_DATA} ${WRKSRC}/etc/${FILE} ${STAGEDIR}${PREFIX}/etc/openslp/${FILE}.sample
 .endfor
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${INSTALL_WRKSRC}/doc; \
-		${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/\{} \; ;\
-		${FIND} . -type f -exec ${INSTALL_DATA} \{} ${STAGEDIR}${DOCSDIR}/\{} \;)
+	(cd ${INSTALL_WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/net/openslp/pkg-plist b/net/openslp/pkg-plist
index d08b88bf0164..562a2782e365 100644
--- a/net/openslp/pkg-plist
+++ b/net/openslp/pkg-plist
@@ -1,80 +1,67 @@
 bin/slptool
-@unexec if cmp -s %D/etc/openslp/slp.reg %D/etc/openslp/slp.reg.default; then rm -f %D/etc/openslp/slp.reg; fi
-etc/openslp/slp.reg.default
-@exec [ -f %B/slp.reg ] || cp %B/%f %B/slp.reg
-@unexec if cmp -s %D/etc/openslp/slp.conf %D/etc/openslp/slp.conf.default; then rm -f %D/etc/openslp/slp.conf; fi
-etc/openslp/slp.conf.default
-@exec [ -f %B/slp.conf ] || cp %B/%f %B/slp.conf
-@unexec if cmp -s %D/etc/openslp/slp.spi %D/etc/openslp/slp.spi.default; then rm -f %D/etc/openslp/slp.spi; fi
-etc/openslp/slp.spi.default
-@exec [ -f %B/slp.spi ] || cp %B/%f %B/slp.spi
-@dirrm etc/openslp
+@sample etc/openslp/slp.conf.sample
+@sample etc/openslp/slp.reg.sample
+@sample etc/openslp/slp.spi.sample
 include/slp.h
 lib/libslp.a
 lib/libslp.so
 lib/libslp.so.1
 lib/libslp.so.1.0.1
 sbin/slpd
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1766.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2165.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2254.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2396.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2608.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2609.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2610.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2614.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/srvreg-integrity.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/threat_analysis_min_security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Divergence.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Examples.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPAttrCallback.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPClose.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPDelAttrs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPDereg.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPError.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPEscape.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindAttrs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindScopes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindSrvTypes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFindSrvs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPFree.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPGetProperty.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPGetRefreshInterval.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPOpen.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPReg.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPParseSrvURL.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPRegReport.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSetProperty.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSrvTypeCallback.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPSrvURLCallback.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPTypes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/SLPUnescape.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/Syntax.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/openslp_security_whitepaper.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ProgrammersGuide/smalllogo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/AgentInit.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/ServiceReg.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/ServiceRqst.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/IntroductionToSLP/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/CommandLine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/FileLocations.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Installation.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Optimization.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/Security.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/SlpConf.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/SlpReg.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/UserFAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/WhenToRunSlpd.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/WhoShouldRead.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/UsersGuide/smalllogo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/UsersGuide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/IntroductionToSLP
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ProgrammersGuide
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%