diff --git a/print/hs-hscolour-docs/Makefile b/print/hs-hscolour-docs/Makefile
index 78adb4d13730..683b4a4cd21d 100644
--- a/print/hs-hscolour-docs/Makefile
+++ b/print/hs-hscolour-docs/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	hscolour-docs
-PORTVERSION=	1.9
+PORTVERSION=	1.10
 CATEGORIES=	print haskell
-MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/
+MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
+		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
 DISTNAME=	hscolour-${PORTVERSION}
 
@@ -20,24 +21,23 @@ BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
 		HsColour:${PORTSDIR}/print/hs-hscolour
 
 HSCOLOUR_VERSION=	${PORTVERSION}
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 
 CABAL_CMD=	runghc Setup.hs
 
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-PLIST_SUB=	DOCSDIR_REL=${DOCSDIR_REL}
 
 .SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build && \
-		${CABAL_CMD} haddock --executables --hyperlink-source \
-				     --hscolour-css=${LOCALBASE}/share/hscolour-${HSCOLOUR_VERSION}/hscolour.css
+	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 
 do-install:
 	${MKDIR} ${DOCSDIR}/html
-	cd ${WRKSRC}/dist/doc/html/hscolour && ${CP} -R * ${DOCSDIR}/html
+	cd ${WRKSRC}/dist/doc/html/hscolour && ${COPYTREE_SHARE} \* ${DOCSDIR}/html
 
 .include <bsd.port.mk>
diff --git a/print/hs-hscolour-docs/distinfo b/print/hs-hscolour-docs/distinfo
index 55a92fe29766..412931ac848e 100644
--- a/print/hs-hscolour-docs/distinfo
+++ b/print/hs-hscolour-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (hscolour-1.9.tar.gz) = badfe50d4215f23d0e17928b24f80773
-SHA256 (hscolour-1.9.tar.gz) = 9d961264fe86f7128673c624943062ea0af19b1c80e303fcdb6957cadc5ac774
-SIZE (hscolour-1.9.tar.gz) = 43119
+MD5 (hscolour-1.10.tar.gz) = 553b71a6b269b023de7050461918a8e0
+SHA256 (hscolour-1.10.tar.gz) = ebeeb6829d8789b16a66753144dfcf4ba35f12d40ff978be4b5669d8cbb09073
+SIZE (hscolour-1.10.tar.gz) = 51246
diff --git a/print/hs-hscolour-docs/pkg-plist b/print/hs-hscolour-docs/pkg-plist
index 15e2df9d6971..840be13e150a 100644
--- a/print/hs-hscolour-docs/pkg-plist
+++ b/print/hs-hscolour-docs/pkg-plist
@@ -1,60 +1,60 @@
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-General.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour.html
-%%DOCSDIR_REL%%/html/HsColour/Main.html
-%%DOCSDIR_REL%%/html/HsColour/doc-index.html
-%%DOCSDIR_REL%%/html/HsColour/haddock-util.js
-%%DOCSDIR_REL%%/html/HsColour/haddock.css
-%%DOCSDIR_REL%%/html/HsColour/haskell_icon.gif
-%%DOCSDIR_REL%%/html/HsColour/index.html
-%%DOCSDIR_REL%%/html/HsColour/minus.gif
-%%DOCSDIR_REL%%/html/HsColour/plus.gif
-%%DOCSDIR_REL%%/html/HsColour/src/Main.html
-%%DOCSDIR_REL%%/html/HsColour/src/hscolour.css
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-General.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour.html
-%%DOCSDIR_REL%%/html/doc-index.html
-%%DOCSDIR_REL%%/html/haddock-util.js
-%%DOCSDIR_REL%%/html/haddock.css
-%%DOCSDIR_REL%%/html/haskell_icon.gif
-%%DOCSDIR_REL%%/html/hscolour.haddock
-%%DOCSDIR_REL%%/html/index.html
-%%DOCSDIR_REL%%/html/minus.gif
-%%DOCSDIR_REL%%/html/plus.gif
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-General.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour.html
-%%DOCSDIR_REL%%/html/src/hscolour.css
-@dirrm %%DOCSDIR_REL%%/html/src
-@dirrm %%DOCSDIR_REL%%/html/HsColour/src
-@dirrm %%DOCSDIR_REL%%/html/HsColour
-@dirrm %%DOCSDIR_REL%%/html
-@dirrmtry %%DOCSDIR_REL%%
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ANSI.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Anchors.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-CSS.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Classify.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ColourHighlight.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Colourise.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-General.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-HTML.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-LaTeX.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-MIRC.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-TTY.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour.html
+%%DOCSDIR%%/html/HsColour/Main.html
+%%DOCSDIR%%/html/HsColour/doc-index.html
+%%DOCSDIR%%/html/HsColour/haddock-util.js
+%%DOCSDIR%%/html/HsColour/haddock.css
+%%DOCSDIR%%/html/HsColour/haskell_icon.gif
+%%DOCSDIR%%/html/HsColour/index.html
+%%DOCSDIR%%/html/HsColour/minus.gif
+%%DOCSDIR%%/html/HsColour/plus.gif
+%%DOCSDIR%%/html/HsColour/src/Main.html
+%%DOCSDIR%%/html/HsColour/src/hscolour.css
+%%DOCSDIR%%/html/Language-Haskell-HsColour-ANSI.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-Anchors.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-CSS.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-Classify.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-ColourHighlight.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-Colourise.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-General.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-HTML.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-LaTeX.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-MIRC.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-TTY.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour.html
+%%DOCSDIR%%/html/doc-index.html
+%%DOCSDIR%%/html/haddock-util.js
+%%DOCSDIR%%/html/haddock.css
+%%DOCSDIR%%/html/haskell_icon.gif
+%%DOCSDIR%%/html/hscolour.haddock
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/minus.gif
+%%DOCSDIR%%/html/plus.gif
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-ANSI.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Anchors.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-CSS.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Classify.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-ColourHighlight.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Colourise.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-General.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-HTML.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-LaTeX.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-MIRC.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-TTY.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour.html
+%%DOCSDIR%%/html/src/hscolour.css
+@dirrm %%DOCSDIR%%/html/src
+@dirrm %%DOCSDIR%%/html/HsColour/src
+@dirrm %%DOCSDIR%%/html/HsColour
+@dirrm %%DOCSDIR%%/html
+@dirrmtry %%DOCSDIR%%