diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index 3bad9aeb14ec..846477f23e77 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	glut
-PORTVERSION=	2.1.1.1
-PORTREVISION=	3
+PORTVERSION=	2.1.1.2
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -14,7 +13,7 @@ PKGNAMESUFFIX=	-ghc
 DISTNAME=	GLUT-${PORTVERSION}
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A Compiler for the functional language Haskell
+COMMENT=	A Haskell binding for the OpenGL Utility Toolkit
 
 USE_GL=		glut
 
@@ -23,6 +22,8 @@ PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		PORTNAME=${PORTNAME} \
 		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+PORTDOCS=	LICENSE html
 
 .include <bsd.port.pre.mk>
 
@@ -36,6 +37,13 @@ CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
 SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
 
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
 	 --libsubdir='' --datasubdir=''
@@ -43,6 +51,9 @@ do-configure:
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build \
 	 && ${CABALCMD} --gen-script register
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${CABALCMD} haddock
+.endif
 
 do-install:
 	cd ${WRKSRC} && ${CABALCMD} install \
diff --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo
index 57d2e24f77b7..d23ac8ebe73a 100644
--- a/x11-toolkits/hs-GLUT/distinfo
+++ b/x11-toolkits/hs-GLUT/distinfo
@@ -1,3 +1,3 @@
-MD5 (GLUT-2.1.1.1.tar.gz) = 0af5df3ede4db67a1efa03bc55e08c01
-SHA256 (GLUT-2.1.1.1.tar.gz) = 09631322c78c1d5d2733fb5324344db68e99015162445c3364b844308c1e027e
-SIZE (GLUT-2.1.1.1.tar.gz) = 121577
+MD5 (GLUT-2.1.1.2.tar.gz) = 67e5996a7fe56af764393f1cf80b9a43
+SHA256 (GLUT-2.1.1.2.tar.gz) = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb
+SIZE (GLUT-2.1.1.2.tar.gz) = 121228
diff --git a/x11-toolkits/hs-GLUT/pkg-plist b/x11-toolkits/hs-GLUT/pkg-plist
index 7893312c670d..69e9196a268f 100644
--- a/x11-toolkits/hs-GLUT/pkg-plist
+++ b/x11-toolkits/hs-GLUT/pkg-plist
@@ -23,8 +23,8 @@
 %%SUBDIR%%/HSGLUT-%%PORTVERSION%%.o
 %%SUBDIR%%/include/HsGLUT.h
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-share/doc/GLUT-%%PORTVERSION%%/LICENSE
-@dirrm share/doc/GLUT-%%PORTVERSION%%
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%
 @dirrm %%SUBDIR%%/Graphics/UI/GLUT/Callbacks
 @dirrm %%SUBDIR%%/Graphics/UI/GLUT
 @dirrmtry %%SUBDIR%%/Graphics/UI
diff --git a/x11-toolkits/hs-glut-ghc/Makefile b/x11-toolkits/hs-glut-ghc/Makefile
index 3bad9aeb14ec..846477f23e77 100644
--- a/x11-toolkits/hs-glut-ghc/Makefile
+++ b/x11-toolkits/hs-glut-ghc/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	glut
-PORTVERSION=	2.1.1.1
-PORTREVISION=	3
+PORTVERSION=	2.1.1.2
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/GLUT/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -14,7 +13,7 @@ PKGNAMESUFFIX=	-ghc
 DISTNAME=	GLUT-${PORTVERSION}
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A Compiler for the functional language Haskell
+COMMENT=	A Haskell binding for the OpenGL Utility Toolkit
 
 USE_GL=		glut
 
@@ -23,6 +22,8 @@ PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
 		PORTVERSION=${PORTVERSION} \
 		PORTNAME=${PORTNAME} \
 		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+PORTDOCS=	LICENSE html
 
 .include <bsd.port.pre.mk>
 
@@ -36,6 +37,13 @@ CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
 SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
 
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
+.endif
+
 do-configure:
 	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
 	 --libsubdir='' --datasubdir=''
@@ -43,6 +51,9 @@ do-configure:
 do-build:
 	cd ${WRKSRC} && ${CABALCMD} build \
 	 && ${CABALCMD} --gen-script register
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${CABALCMD} haddock
+.endif
 
 do-install:
 	cd ${WRKSRC} && ${CABALCMD} install \
diff --git a/x11-toolkits/hs-glut-ghc/distinfo b/x11-toolkits/hs-glut-ghc/distinfo
index 57d2e24f77b7..d23ac8ebe73a 100644
--- a/x11-toolkits/hs-glut-ghc/distinfo
+++ b/x11-toolkits/hs-glut-ghc/distinfo
@@ -1,3 +1,3 @@
-MD5 (GLUT-2.1.1.1.tar.gz) = 0af5df3ede4db67a1efa03bc55e08c01
-SHA256 (GLUT-2.1.1.1.tar.gz) = 09631322c78c1d5d2733fb5324344db68e99015162445c3364b844308c1e027e
-SIZE (GLUT-2.1.1.1.tar.gz) = 121577
+MD5 (GLUT-2.1.1.2.tar.gz) = 67e5996a7fe56af764393f1cf80b9a43
+SHA256 (GLUT-2.1.1.2.tar.gz) = d5ecf4b6bacc5e68ade00710df04fa158c6ed322c74362954716a0baba6bd3fb
+SIZE (GLUT-2.1.1.2.tar.gz) = 121228
diff --git a/x11-toolkits/hs-glut-ghc/pkg-plist b/x11-toolkits/hs-glut-ghc/pkg-plist
index 7893312c670d..69e9196a268f 100644
--- a/x11-toolkits/hs-glut-ghc/pkg-plist
+++ b/x11-toolkits/hs-glut-ghc/pkg-plist
@@ -23,8 +23,8 @@
 %%SUBDIR%%/HSGLUT-%%PORTVERSION%%.o
 %%SUBDIR%%/include/HsGLUT.h
 %%SUBDIR%%/%%PORTNAME%%-register.sh
-share/doc/GLUT-%%PORTVERSION%%/LICENSE
-@dirrm share/doc/GLUT-%%PORTVERSION%%
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%
 @dirrm %%SUBDIR%%/Graphics/UI/GLUT/Callbacks
 @dirrm %%SUBDIR%%/Graphics/UI/GLUT
 @dirrmtry %%SUBDIR%%/Graphics/UI