diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
new file mode 100644
index 00000000000..b1fe055b1c6
--- /dev/null
+++ b/devel/hs-hlint/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2010/09/26 18:36:09 jasper Exp $
+
+COMMENT=		source code suggestions for Haskell
+
+DISTNAME=		hlint-1.8
+CATEGORIES=		devel
+
+HOMEPAGE=		http://community.haskell.org/~ndm/hlint/
+
+# GPLv2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB += c gmp m pthread util
+
+MODULES=		converters/libiconv \
+			lang/ghc
+
+MODGHC_BUILD=		cabal hackage haddock register
+
+BUILD_DEPENDS=		${RUN_DEPENDS}
+RUN_DEPENDS=		::devel/cpphs,-lib \
+			:hscolour->=1.17:devel/hscolour \
+			::devel/hs-uniplate \
+			::lang/hs-haskell-src-exts
+LIB_DEPENDS=		::devel/gmp
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/data/hlint.1 ${PREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
new file mode 100644
index 00000000000..c12a7ba6c2d
--- /dev/null
+++ b/devel/hs-hlint/distinfo
@@ -0,0 +1,5 @@
+MD5 (hlint-1.8.tar.gz) = Mwozb/JFi0G9p005lsX5cw==
+RMD160 (hlint-1.8.tar.gz) = tFsx+v1eztLf+xBXWRXsu8/jm1M=
+SHA1 (hlint-1.8.tar.gz) = 11I0q9fXC6M1TOtywpGttBqBPnA=
+SHA256 (hlint-1.8.tar.gz) = OP0ajuqeD1RGw/a6/uqMl7WwXXIY85CDBcV5N3Cf8DI=
+SIZE (hlint-1.8.tar.gz) = 59889
diff --git a/devel/hs-hlint/patches/patch-hlint_cabal b/devel/hs-hlint/patches/patch-hlint_cabal
new file mode 100644
index 00000000000..0e10308acce
--- /dev/null
+++ b/devel/hs-hlint/patches/patch-hlint_cabal
@@ -0,0 +1,14 @@
+$OpenBSD: patch-hlint_cabal,v 1.1.1.1 2010/09/26 18:36:09 jasper Exp $
+
+Don't let Cabal deal with the manpage, install it ourselves.
+
+--- hlint.cabal.orig	Sun Sep 26 11:41:57 2010
++++ hlint.cabal	Sun Sep 26 11:42:04 2010
+@@ -23,7 +23,6 @@ data-files:
+     Test.hs
+     report.html
+     hs-lint.el
+-    hlint.1
+     hlint.ghci
+ extra-source-files:
+     hlint.htm
diff --git a/devel/hs-hlint/pkg/DESCR b/devel/hs-hlint/pkg/DESCR
new file mode 100644
index 00000000000..8bdb2b64b7d
--- /dev/null
+++ b/devel/hs-hlint/pkg/DESCR
@@ -0,0 +1,3 @@
+HLint is a tool for suggesting possible improvements to Haskell code.
+These suggestions include ideas such as using alternative functions,
+simplifying code and spotting redundancies.
diff --git a/devel/hs-hlint/pkg/PLIST b/devel/hs-hlint/pkg/PLIST
new file mode 100644
index 00000000000..3ad37f90050
--- /dev/null
+++ b/devel/hs-hlint/pkg/PLIST
@@ -0,0 +1,71 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2010/09/26 18:36:09 jasper Exp $
+@bin bin/hlint
+lib/${DISTNAME}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Apply.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/CmdLine.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HLint.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/All.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/Bracket.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/Evaluate.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/Match.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/NameMatch.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/Type.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HSE/Util.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/HS${DISTNAME}.o
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/All.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Bracket.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Extensions.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Import.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Lambda.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/List.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/ListRec.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Match.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Monad.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Naming.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Pragma.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Structure.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Type.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Hint/Util.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Idea.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Language/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Language/Haskell/
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Language/Haskell/HLint.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Parallel.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Paths_hlint.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Report.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Settings.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Test.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/Util.hi
+lib/${DISTNAME}/ghc-${MODGHC_VER}/libHS${DISTNAME}.a
+lib/${DISTNAME}/register.sh
+@exec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/register.sh -v0
+@unexec /usr/bin/env HOME=/nonexistent %D/lib/${DISTNAME}/unregister.sh -v0 --force
+lib/${DISTNAME}/unregister.sh
+@man man/man1/hlint.1
+share/doc/${DISTNAME}/
+share/doc/${DISTNAME}/LICENSE
+share/doc/${DISTNAME}/html/
+share/doc/${DISTNAME}/html/Language-Haskell-HLint.html
+share/doc/${DISTNAME}/html/doc-index.html
+share/doc/${DISTNAME}/html/frames.html
+share/doc/${DISTNAME}/html/haddock-util.js
+share/doc/${DISTNAME}/html/haddock.css
+share/doc/${DISTNAME}/html/haskell_icon.gif
+share/doc/${DISTNAME}/html/hlint.haddock
+share/doc/${DISTNAME}/html/index-frames.html
+share/doc/${DISTNAME}/html/index.html
+share/doc/${DISTNAME}/html/mini_Language-Haskell-HLint.html
+share/doc/${DISTNAME}/html/minus.gif
+share/doc/${DISTNAME}/html/plus.gif
+share/${DISTNAME}/
+share/${DISTNAME}/Default.hs
+share/${DISTNAME}/Dollar.hs
+share/${DISTNAME}/Generalise.hs
+share/${DISTNAME}/HLint.hs
+share/${DISTNAME}/Test.hs
+share/${DISTNAME}/hlint.ghci
+share/${DISTNAME}/hs-lint.el
+share/${DISTNAME}/report.html