diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index e35fdebb3c0d..2d55e58d6ca0 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -309,6 +309,7 @@ wai_port=			www/hs-wai
 wai-app-static_port=		www/hs-wai-app-static
 wai-extra_port=			www/hs-wai-extra
 wai-logger_port=		www/hs-wai-logger
+wai-test_port=			www/hs-wai-test
 warp_port=			www/hs-warp
 webkit_port=			www/hs-webkit
 wx_port=			x11-toolkits/hs-wx
diff --git a/www/Makefile b/www/Makefile
index 1be9a03f4375..d2232971df60 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -315,6 +315,7 @@
     SUBDIR += hs-wai-app-static
     SUBDIR += hs-wai-extra
     SUBDIR += hs-wai-logger
+    SUBDIR += hs-wai-test
     SUBDIR += hs-warp
     SUBDIR += hs-webkit
     SUBDIR += hs-xss-sanitize
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
new file mode 100644
index 000000000000..56ae3b811221
--- /dev/null
+++ b/www/hs-wai-test/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for: hs-wai-test
+# Date created:        June 10, 2012
+# Whom:                haskell@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	wai-test
+PORTVERSION=	1.2.0.2
+CATEGORIES=	www haskell
+
+MAINTAINER=	haskell@FreeBSD.org
+COMMENT=	Unit test framework (built on HUnit) for WAI applications
+
+LICENSE=	MIT
+
+USE_CABAL=	blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.4 \
+		case-insensitive>=0.2 conduit>=0.4 cookie>=0.2 \
+		http-types>=0.6 HUnit>=1.2 text>=0.7 transformers>=0.2.2 \
+		wai>=1.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
new file mode 100644
index 000000000000..d459baf24cba
--- /dev/null
+++ b/www/hs-wai-test/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/wai-test-1.2.0.2.tar.gz) = f23f5d691b71d8e4f833bd61cbc3ed0290c123a1b157c80d60108dff407a157d
+SIZE (cabal/wai-test-1.2.0.2.tar.gz) = 3203
diff --git a/www/hs-wai-test/pkg-descr b/www/hs-wai-test/pkg-descr
new file mode 100644
index 000000000000..192e9622160a
--- /dev/null
+++ b/www/hs-wai-test/pkg-descr
@@ -0,0 +1,3 @@
+Unit test framework (built on HUnit) for WAI applications.
+
+WWW:	http://www.yesodweb.com/book/wai