diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 2881a32f02fe..46c07f24ccb5 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -9,13 +9,16 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Encrypted, secure compressed TCP tunnel
 
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/GPL2.txt
+
 USES=		perl5
 USE_OPENSSL=	yes
 USE_PERL5=	build
 
-EXAMPLES=	vncviewer.zbd vncserver.zbd server.key server.id client1.key \
+PORTEXAMPLES=	vncviewer.zbd vncserver.zbd server.key server.id client1.key \
 		client2.key clients.id
-DOCS=		README.txt LICENCE.txt CHANGES.txt zebedee.html ftpgw.tcl.html
+PORTDOCS=	README.txt CHANGES.txt zebedee.html ftpgw.tcl.html
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
@@ -27,16 +30,19 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/zebedee ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/ftpgw.tcl ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/zebedee.1 ${STAGEDIR}${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/zebedee.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/ftpgw.tcl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/server.zbd ${STAGEDIR}${PREFIX}/etc/server.zbd.sample
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-.for e in ${EXAMPLES}
+
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+.for e in ${PORTEXAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/${e} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for d in ${DOCS}
+.for d in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
diff --git a/security/zebedee/pkg-plist b/security/zebedee/pkg-plist
index 5ba9ce8f5c32..7c98246df84e 100644
--- a/security/zebedee/pkg-plist
+++ b/security/zebedee/pkg-plist
@@ -3,15 +3,3 @@ bin/zebedee
 etc/server.zbd.sample
 man/man1/ftpgw.tcl.1.gz
 man/man1/zebedee.1.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client1.key
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client2.key
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clients.id
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.id
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.key
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncserver.zbd
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncviewer.zbd
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html
-%%PORTDOCS%%%%DOCSDIR%%/zebedee.html