diff --git a/devel/hs-shelly/Makefile b/devel/hs-shelly/Makefile
new file mode 100644
index 00000000000..a7d517d9436
--- /dev/null
+++ b/devel/hs-shelly/Makefile
@@ -0,0 +1,29 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2016/02/01 14:24:02 kili Exp $
+
+COMMENT =		shell-like programming in Haskell
+
+DISTNAME =		shelly-1.6.5
+CATEGORIES =		devel
+
+# BSD3
+PERMIT_PACKAGE_CDROM =	Yes
+
+MODULES =		lang/ghc
+MODGHC_BUILD =		cabal hackage haddock register
+
+MODGHC_PACKAGE_KEY =	FQwPgYmtUonBRg4nimRsDk
+
+BUILD_DEPENDS =		${RUN_DEPENDS}
+
+RUN_DEPENDS =		devel/hs-async \
+			devel/hs-enclosed-exceptions \
+			devel/hs-exceptions>=0.6,<0.9 \
+			devel/hs-lifted-async \
+			devel/hs-monad-control>=0.3.2,<1.1 \
+			devel/hs-system-fileio<0.4 \
+			devel/hs-system-filepath>=0.4.7,<0.5 \
+			devel/hs-text \
+			devel/hs-transformers-base \
+			devel/hs-unix-compat<0.5
+
+.include <bsd.port.mk>
diff --git a/devel/hs-shelly/distinfo b/devel/hs-shelly/distinfo
new file mode 100644
index 00000000000..8818a497a70
--- /dev/null
+++ b/devel/hs-shelly/distinfo
@@ -0,0 +1,2 @@
+SHA256 (ghc/shelly-1.6.5.tar.gz) = vf0JsB896OfljphZGrGkKtWnQwj/KfGazRbXzIW3HNw=
+SIZE (ghc/shelly-1.6.5.tar.gz) = 97274
diff --git a/devel/hs-shelly/pkg/DESCR b/devel/hs-shelly/pkg/DESCR
new file mode 100644
index 00000000000..68a6bfee0e7
--- /dev/null
+++ b/devel/hs-shelly/pkg/DESCR
@@ -0,0 +1,11 @@
+Shelly provides convenient systems programming in Haskell, similar
+in spirit to POSIX shells. Shelly:
+
+* is aimed at convenience and getting things done rather than being
+  a demonstration of elegance
+
+* has detailed and useful error messages
+
+* maintains its own environment, making it thread-safe
+
+* is modern, using Text and system-filepath/system-fileio
diff --git a/devel/hs-shelly/pkg/PLIST b/devel/hs-shelly/pkg/PLIST
new file mode 100644
index 00000000000..963f2be6216
--- /dev/null
+++ b/devel/hs-shelly/pkg/PLIST
@@ -0,0 +1,67 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2016/02/01 14:24:02 kili Exp $
+lib/ghc/${DISTNAME}/
+lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
+lib/ghc/${DISTNAME}/Shelly/
+lib/ghc/${DISTNAME}/Shelly.hi
+lib/ghc/${DISTNAME}/Shelly.p_hi
+lib/ghc/${DISTNAME}/Shelly/Base.hi
+lib/ghc/${DISTNAME}/Shelly/Base.p_hi
+lib/ghc/${DISTNAME}/Shelly/Find.hi
+lib/ghc/${DISTNAME}/Shelly/Find.p_hi
+lib/ghc/${DISTNAME}/Shelly/Lifted.hi
+lib/ghc/${DISTNAME}/Shelly/Lifted.p_hi
+lib/ghc/${DISTNAME}/Shelly/Pipe.hi
+lib/ghc/${DISTNAME}/Shelly/Pipe.p_hi
+lib/ghc/${DISTNAME}/Shelly/Unix.hi
+lib/ghc/${DISTNAME}/Shelly/Unix.p_hi
+lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a
+lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a
+lib/ghc/${DISTNAME}/register.sh
+share/doc/hs-${DISTNAME}/
+share/doc/hs-${DISTNAME}/LICENSE
+share/doc/hs-${DISTNAME}/html/
+share/doc/hs-${DISTNAME}/html/Shelly-Lifted.html
+share/doc/hs-${DISTNAME}/html/Shelly-Pipe.html
+share/doc/hs-${DISTNAME}/html/Shelly-Unix.html
+share/doc/hs-${DISTNAME}/html/Shelly.html
+share/doc/hs-${DISTNAME}/html/doc-index-45.html
+share/doc/hs-${DISTNAME}/html/doc-index-60.html
+share/doc/hs-${DISTNAME}/html/doc-index-A.html
+share/doc/hs-${DISTNAME}/html/doc-index-All.html
+share/doc/hs-${DISTNAME}/html/doc-index-B.html
+share/doc/hs-${DISTNAME}/html/doc-index-C.html
+share/doc/hs-${DISTNAME}/html/doc-index-E.html
+share/doc/hs-${DISTNAME}/html/doc-index-F.html
+share/doc/hs-${DISTNAME}/html/doc-index-G.html
+share/doc/hs-${DISTNAME}/html/doc-index-H.html
+share/doc/hs-${DISTNAME}/html/doc-index-I.html
+share/doc/hs-${DISTNAME}/html/doc-index-K.html
+share/doc/hs-${DISTNAME}/html/doc-index-L.html
+share/doc/hs-${DISTNAME}/html/doc-index-M.html
+share/doc/hs-${DISTNAME}/html/doc-index-O.html
+share/doc/hs-${DISTNAME}/html/doc-index-P.html
+share/doc/hs-${DISTNAME}/html/doc-index-Q.html
+share/doc/hs-${DISTNAME}/html/doc-index-R.html
+share/doc/hs-${DISTNAME}/html/doc-index-S.html
+share/doc/hs-${DISTNAME}/html/doc-index-T.html
+share/doc/hs-${DISTNAME}/html/doc-index-U.html
+share/doc/hs-${DISTNAME}/html/doc-index-V.html
+share/doc/hs-${DISTNAME}/html/doc-index-W.html
+share/doc/hs-${DISTNAME}/html/doc-index.html
+share/doc/hs-${DISTNAME}/html/frames.html
+share/doc/hs-${DISTNAME}/html/haddock-util.js
+share/doc/hs-${DISTNAME}/html/hslogo-16.png
+share/doc/hs-${DISTNAME}/html/index-frames.html
+share/doc/hs-${DISTNAME}/html/index.html
+share/doc/hs-${DISTNAME}/html/mini_Shelly-Lifted.html
+share/doc/hs-${DISTNAME}/html/mini_Shelly-Pipe.html
+share/doc/hs-${DISTNAME}/html/mini_Shelly-Unix.html
+share/doc/hs-${DISTNAME}/html/mini_Shelly.html
+share/doc/hs-${DISTNAME}/html/minus.gif
+share/doc/hs-${DISTNAME}/html/ocean.css
+share/doc/hs-${DISTNAME}/html/plus.gif
+share/doc/hs-${DISTNAME}/html/shelly.haddock
+share/doc/hs-${DISTNAME}/html/synopsis.png
+@exec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/register.sh -v0
+@unexec /usr/bin/env HOME=/nonexistent %D/lib/ghc/${DISTNAME}/unregister.sh -v0 --force
+lib/ghc/${DISTNAME}/unregister.sh