diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
index a185f263ee9b..9cb5e082c1aa 100644
--- a/devel/hs-haskell-platform/Makefile
+++ b/devel/hs-haskell-platform/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	haskell-platform
 PORTVERSION=	2011.2.0.1
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -32,7 +33,7 @@ USE_CABAL=	cgi==3001.1.7.4,1 \
 		regex-posix==0.94.4 \
 		stm==2.2.0.1 \
 		syb==0.3 \
-		xhtml==3000.2.0.1 \
+		xhtml==3000.2.0.1_1 \
 		zlib==0.5.3.1 \
 		HTTP==4000.1.1 \
 		deepseq==1.1.0.2 \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 2bb59dc301a3..74434ec1be6f 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	7.0.3
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://haskell.org/ghc/dist/${PORTVERSION}/:source \
 		${MASTER_SITE_LOCAL:S/$/:boot/} \
@@ -289,7 +290,9 @@ post-install:
 	cd ${DOCSDIR}/html/libraries && ./gen_contents_index
 .endif
 	@${RM} -f ${PREFIX}/bin/haddock
+.if !defined(NOPORTDOCS)
 	@${LN} -sf ${PREFIX}/bin/haddock-ghc-${GHC_VERSION} ${PREFIX}/bin/haddock
+.endif
 	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 58424a5cbba1..a173c8162733 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -29,7 +29,7 @@ FILE_LICENSE?=	LICENSE
 .if !defined(DOCUMENTATION) && \
     (${PORTNAME} == haddock || ${PORTNAME} == ghc-paths || \
      ${PORTNAME} == hscolour || ${PORTNAME} == mtl || \
-     ${PORTNAME} == transformers)
+     ${PORTNAME} == transformers || ${PORTNAME} == xhtml)
 NOPORTDOCS=	yes
 .endif
 
@@ -60,7 +60,7 @@ HADDOCK_CMD?=	${LOCALBASE}/bin/haddock
 
 GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION}
 
-HADDOCK_PORT=	${PORTSDIR}/lang/ghc
+HADDOCK_PORT=	${PORTSDIR}/devel/hs-haddock
 
 CABAL_DOCSDIR=		${PREFIX}/share/doc/ghc-${GHC_VERSION}/cabal
 CABAL_DOCSDIR_REL=	${CABAL_DOCSDIR:S,^${PREFIX}/,,}
diff --git a/textproc/hs-xhtml/Makefile b/textproc/hs-xhtml/Makefile
index 815fd542f749..07a6043c505a 100644
--- a/textproc/hs-xhtml/Makefile
+++ b/textproc/hs-xhtml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xhtml
 PORTVERSION=	3000.2.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org