diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 95cff2d43ada..62531ecc8d18 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmonad
-PORTVERSION=	0.8
+PORTVERSION=	0.8.1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -23,14 +23,18 @@ CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.3
 SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		SUBDIR=${SUBDIR}
 
 MAN1=		xmonad.1
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -38,7 +42,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index 8779a43498a2..d8b88fe75902 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-0.8.tar.gz) = 677a154a32add77b6ae3dfa97d9873e0
-SHA256 (xmonad-0.8.tar.gz) = 982a3189e6815dc7e1a9dfc5200a1d746490abe1a8a953f093ea9597a0d40681
-SIZE (xmonad-0.8.tar.gz) = 52896
+MD5 (xmonad-0.8.1.tar.gz) = 03a8f0a420902d9eea3df1d8d62598c7
+SHA256 (xmonad-0.8.1.tar.gz) = 9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c
+SIZE (xmonad-0.8.1.tar.gz) = 52878
diff --git a/x11-wm/hs-xmonad/pkg-plist b/x11-wm/hs-xmonad/pkg-plist
index 7aedbd5c5a6b..e6efdf8b9ce5 100644
--- a/x11-wm/hs-xmonad/pkg-plist
+++ b/x11-wm/hs-xmonad/pkg-plist
@@ -10,25 +10,6 @@ bin/xmonad
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a
 %%SUBDIR%%/register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Core.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Main.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-ManageHook.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Operations.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-StackSet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/xmonad.haddock
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
 @dirrm %%SUBDIR%%
diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile
index 95cff2d43ada..62531ecc8d18 100644
--- a/x11-wm/xmonad/Makefile
+++ b/x11-wm/xmonad/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmonad
-PORTVERSION=	0.8
+PORTVERSION=	0.8.1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -23,14 +23,18 @@ CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.3
 SUBDIR=		lib/${PORTNAME}-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		SUBDIR=${SUBDIR}
 
 MAN1=		xmonad.1
 
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.else
+PLIST_DIRS+=	%%DOCSDIR%%
+PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .endif
 
 do-configure:
@@ -38,7 +42,7 @@ do-configure:
 
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} register --gen-script
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
 	cd ${WRKSRC} && ${CABALCMD} haddock
 .endif
 
diff --git a/x11-wm/xmonad/distinfo b/x11-wm/xmonad/distinfo
index 8779a43498a2..d8b88fe75902 100644
--- a/x11-wm/xmonad/distinfo
+++ b/x11-wm/xmonad/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmonad-0.8.tar.gz) = 677a154a32add77b6ae3dfa97d9873e0
-SHA256 (xmonad-0.8.tar.gz) = 982a3189e6815dc7e1a9dfc5200a1d746490abe1a8a953f093ea9597a0d40681
-SIZE (xmonad-0.8.tar.gz) = 52896
+MD5 (xmonad-0.8.1.tar.gz) = 03a8f0a420902d9eea3df1d8d62598c7
+SHA256 (xmonad-0.8.1.tar.gz) = 9d58789a0bc08d40b9d14097b079822c7b8290d60efc6aa79144abf47d5db32c
+SIZE (xmonad-0.8.1.tar.gz) = 52878
diff --git a/x11-wm/xmonad/pkg-plist b/x11-wm/xmonad/pkg-plist
index 7aedbd5c5a6b..e6efdf8b9ce5 100644
--- a/x11-wm/xmonad/pkg-plist
+++ b/x11-wm/xmonad/pkg-plist
@@ -10,25 +10,6 @@ bin/xmonad
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad/StackSet.hi
 %%SUBDIR%%/ghc-%%GHC_VERSION%%/libHSxmonad-%%PORTVERSION%%.a
 %%SUBDIR%%/register.sh
-%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Config.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Core.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Layout.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Main.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-ManageHook.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-Operations.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad-StackSet.html
-%%PORTDOCS%%%%DOCSDIR%%/html/XMonad.html
-%%PORTDOCS%%%%DOCSDIR%%/html/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock-util.js
-%%PORTDOCS%%%%DOCSDIR%%/html/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/html/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html/minus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/xmonad.haddock
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%/XMonad
 @dirrm %%SUBDIR%%/ghc-%%GHC_VERSION%%
 @dirrm %%SUBDIR%%