--- ./Makefile	2013-01-14 17:57:25.000000000 +0100
+++ ./Makefile	2013-03-10 00:15:20.000000000 +0100
@@ -3,15 +3,15 @@ 
 
 PORTNAME=	fbpanel
 PORTVERSION=	6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tbz2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Lightweight, NETWM compliant X11 desktop panel
 
-LICENSE=	GPLv2
+LICENSE=	MIT
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
@@ -22,12 +22,34 @@ 
 
 MAN1=		${PORTNAME}.1
 
+PORTDOCS=	CHANGELOG CREDITS NOTES README
+
+OPTIONS_DEFINE=	DOCS
+
+DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "System;" false
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/scripts/install.sh
 	@${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \
 		${WRKSRC}/data/man/${MAN1}.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1/
+	${LN} -sf ${DATADIR}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
--- ./pkg-plist	2013-01-14 17:57:25.000000000 +0100
+++ ./pkg-plist	2013-03-10 00:03:14.000000000 +0100
@@ -22,6 +22,10 @@ 
 lib/fbpanel/volume.so
 lib/fbpanel/wincmd.so
 libexec/fbpanel/make_profile
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/NOTES
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/default
 %%DATADIR%%/images/battery_0.png
 %%DATADIR%%/images/battery_1.png
@@ -48,7 +52,9 @@ 
 %%DATADIR%%/images/gnome-session-reboot.png
 %%DATADIR%%/images/logo.png
 %%DATADIR%%/pager
+share/pixmaps/fbpanel.png
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/fbpanel
 @dirrm lib/fbpanel