diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 25ea04b6940..dca2562f899 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2011/11/13 22:41:25 kili Exp $
+# $OpenBSD: Makefile,v 1.2 2012/09/02 20:27:16 kili Exp $
 
 COMMENT =		command line parser library
 
-DISTNAME =		cmdargs-0.7
+DISTNAME =		cmdargs-0.9.5
 CATEGORIES =		devel
 HOMEPAGE =		http://community.haskell.org/~ndm/cmdargs/
 
@@ -20,6 +20,6 @@ MODGHC_BUILD =		cabal hackage haddock register
 MODGHC_SETUP_CONF_ARGS =	-f -testprog
 
 BUILD_DEPENDS =		${RUN_DEPENDS}
-RUN_DEPENDS =		hs-transformers->=0.2,<0.3:devel/hs-transformers
+RUN_DEPENDS =		hs-transformers->=0.2,<0.4:devel/hs-transformers
 
 .include <bsd.port.mk>
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index f2bc88501e2..9a68a660c8f 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,5 +1,5 @@
-MD5 (ghc/cmdargs-0.7.tar.gz) = xm2xHsqq46rX6+vnulqlTQ==
-RMD160 (ghc/cmdargs-0.7.tar.gz) = 4OetNvg43E1gOycxRerSbfVWdwI=
-SHA1 (ghc/cmdargs-0.7.tar.gz) = QpoJaNnTeX2rxqYKp+OCimmFtN0=
-SHA256 (ghc/cmdargs-0.7.tar.gz) = eAN2SKhPd//JGjoWruyZulbvug2EanHEFBk4Y1hzMmI=
-SIZE (ghc/cmdargs-0.7.tar.gz) = 43543
+MD5 (ghc/cmdargs-0.9.5.tar.gz) = VkjYXh4DASPYUdUnsgFAlg==
+RMD160 (ghc/cmdargs-0.9.5.tar.gz) = TbFIcxRVUXdV11y4QyKjhQ7epIY=
+SHA1 (ghc/cmdargs-0.9.5.tar.gz) = +c0pdMPxUg+oTiL7Mfb788vY830=
+SHA256 (ghc/cmdargs-0.9.5.tar.gz) = O46bdGkHDdWJP5p7pR1vxGC1Zn4EF0pTS6IVDLm2CkY=
+SIZE (ghc/cmdargs-0.9.5.tar.gz) = 59775
diff --git a/devel/hs-cmdargs/pkg/PLIST b/devel/hs-cmdargs/pkg/PLIST
index 131574beca7..caac6e2ca92 100644
--- a/devel/hs-cmdargs/pkg/PLIST
+++ b/devel/hs-cmdargs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/11/13 22:41:25 kili Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/09/02 20:27:16 kili Exp $
 lib/ghc/${DISTNAME}/
 lib/ghc/${DISTNAME}/Data/
 lib/ghc/${DISTNAME}/Data/Generics/
@@ -14,10 +14,14 @@ lib/ghc/${DISTNAME}/System/Console/CmdArgs/Annotate.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Default.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit.hi
+lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/Complete.hi
+lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/ExpandArgsAt.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/Help.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/Process.hi
+lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/SplitJoin.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Explicit/Type.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/GetOpt.hi
+lib/ghc/${DISTNAME}/System/Console/CmdArgs/Helper.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit/
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit/Ann.hi
@@ -27,6 +31,7 @@ lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit/Reader.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit/Reform.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit/Type.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Implicit/UI.hi
+lib/ghc/${DISTNAME}/System/Console/CmdArgs/Quote.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Text.hi
 lib/ghc/${DISTNAME}/System/Console/CmdArgs/Verbosity.hi
 lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
@@ -41,7 +46,9 @@ share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Annotate.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Default.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Explicit.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-GetOpt.html
+share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Helper.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Implicit.html
+share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Quote.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Text.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs-Verbosity.html
 share/doc/hs-${DISTNAME}/html/System-Console-CmdArgs.html
@@ -58,6 +65,7 @@ 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-J.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-N.html
@@ -80,7 +88,9 @@ share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Annotate.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Default.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Explicit.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-GetOpt.html
+share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Helper.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Implicit.html
+share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Quote.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Text.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs-Verbosity.html
 share/doc/hs-${DISTNAME}/html/mini_System-Console-CmdArgs.html