Index: Makefile
===================================================================
--- Makefile	(revision 320012)
+++ Makefile	(working copy)
@@ -9,7 +9,7 @@
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	beat@FreeBSD.org
-COMMENT=	A small and fast window manager based on BlackBox
+COMMENT=	Small and fast window manager based on BlackBox
 
 RUN_DEPENDS=	xmessage:${PORTSDIR}/x11/xmessage
 
@@ -25,14 +25,15 @@
 		fluxbox-style.5
 DOCSVERSION=	20060629
 
-OPTIONS_DEFINE=	DOCS DOCHTML PDF DEBUG GNOME IMLIB2 XINERAMA \
+OPTIONS_DEFINE=	DOCS DOCHTML PDFDOCS DEBUG GNOME IMLIB2 XINERAMA \
 		XRENDER NLS SLIT REMEMBER TOOLBAR
 OPTIONS_DEFAULT=	XRENDER SLIT REMEMBER TOOLBAR
 DOCHTML_DESC=	Install html documentation
-XRENDER_DESC=	Enable xrender support
+PDFDOCS_DESC=	Build and/or install PDF documentation
+REMEMBER_DESC=	Enable remember feature
 SLIT_DESC=	Enable slit feature
-REMEMBER_DESC=	Enable remember feature
 TOOLBAR_DESC=	Enable toolbar feature
+XRENDER_DESC=	Enable xrender support
 
 .include <bsd.port.options.mk>
 
@@ -51,7 +52,7 @@
 PLIST_SUB+=		DOCHTML:="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MPDF}
+.if ${PORT_OPTIONS:MPDFDOCS}
 # http://fluxbox.org/docbook/en/pdf/
 MASTER_SITES+=		${MASTER_SITE_LOCAL:S,%SUBDIR%,mezz,}:pdf \
 			http://people.freebsd.org/~mezz/distfiles/:pdf
@@ -136,7 +137,7 @@
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
 .endif
-.if ${PORT_OPTIONS:MPDF}
+.if ${PORT_OPTIONS:MPDFDOCS}
 	@${MKDIR} ${DOCSDIR}/pdf
 	@${INSTALL_DATA} ${DISTDIR}/fluxbook-${DOCSVERSION}.pdf \
 		${DOCSDIR}/pdf/