diff --git a/net/libbgpdump/Makefile b/net/libbgpdump/Makefile
index a6ac41abe71d..4f881e8b1eab 100644
--- a/net/libbgpdump/Makefile
+++ b/net/libbgpdump/Makefile
@@ -15,25 +15,16 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
-PORTDOCS=	README
-PORTEXAMPLES=	example.c
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
-NO_STAGE=	yes
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/bgpdump ${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/libbgpdump.* ${PREFIX}/lib
+	@${INSTALL_PROGRAM} ${WRKSRC}/bgpdump ${STAGEDIR}${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/libbgpdump.* ${STAGEDIR}${PREFIX}/lib
 .for i in bgpdump_attr.h bgpdump_formats.h bgpdump_lib.h
-	@${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/include
+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/include
 .endfor
-
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/example.c ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/example.c ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/net/libbgpdump/pkg-descr b/net/libbgpdump/pkg-descr
index 77d76a07899a..b191cc0d9c1f 100644
--- a/net/libbgpdump/pkg-descr
+++ b/net/libbgpdump/pkg-descr
@@ -12,4 +12,4 @@ Entry formats:
           - BGP messages (OPEN, UPDATE, NOTIFY, KEEPALIVE)
           - BGP state changes
 
-WWW:	http://www.ris.ripe.net/source/
+WWW: http://www.ris.ripe.net/source/
diff --git a/net/libbgpdump/pkg-plist b/net/libbgpdump/pkg-plist
index 1537529c23a8..da766d6c99d4 100644
--- a/net/libbgpdump/pkg-plist
+++ b/net/libbgpdump/pkg-plist
@@ -4,3 +4,7 @@ lib/libbgpdump.so
 include/bgpdump_attr.h
 include/bgpdump_formats.h
 include/bgpdump_lib.h
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.c
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%