--- x11/fbpanel/Makefile	(revision 332217)
+++ x11/fbpanel/Makefile	(working copy)
@@ -14,14 +14,11 @@ 
 LICENSE=	MIT
 
 USE_BZIP2=	yes
-USES=		pkgconfig
+USES=		gmake pkgconfig
 USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_GMAKE=	yes
 
-MAN1=		${PORTNAME}.1
-
 PORTDOCS=	CHANGELOG CREDITS NOTES README
 
 OPTIONS_DEFINE=	DOCS
@@ -29,21 +26,15 @@ 
 DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \
 		"${PORTNAME}" "${PORTNAME}" "System;" false
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/scripts/install.sh
 	@${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \
-		${WRKSRC}/data/man/${MAN1}.in
+		${WRKSRC}/data/man/${PORTNAME}.1.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1
-	${LN} -sf ${DATADIR}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+	${INSTALL_MAN} ${WRKSRC}/data/man/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${LN} -sf ${DATADIR}/images/logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
--- x11/fbpanel/pkg-plist	(revision 332217)
+++ x11/fbpanel/pkg-plist	(working copy)
@@ -22,6 +22,7 @@ 
 lib/fbpanel/volume.so
 lib/fbpanel/wincmd.so
 libexec/fbpanel/make_profile
+man/man1/fbpanel.1.gz
 %%DATADIR%%/default
 %%DATADIR%%/images/battery_0.png
 %%DATADIR%%/images/battery_1.png