diff --git a/haskell/haskell-test-framework/README b/haskell/haskell-test-framework/README
index fc115db6bb..9541573353 100644
--- a/haskell/haskell-test-framework/README
+++ b/haskell/haskell-test-framework/README
@@ -4,9 +4,10 @@ deterministic order, to aid diff interpretation) and filtered and
 controlled by command line options.  All of this comes with colored
 test output, progress reporting and test statistics output.
 
-This requires ghc, haskell-ansi-terminal, haskell-hostname,
-haskell-transformers, haskell-xml, haskell-ansi-wl-pprint,
-haskell-mtl, haskell-regex-base, and haskell-regex-posix.
+This requires ghc, haskell-random, haskell-ansi-terminal,
+haskell-hostname, haskell-transformers, haskell-xml,
+haskell-ansi-wl-pprint, haskell-mtl, haskell-regex-base, and
+haskell-regex-posix.
 
 After uninstalling, run this command to unregister the package from
 the ghc package database:   ghc-pkg recache
diff --git a/haskell/haskell-test-framework/haskell-test-framework.SlackBuild b/haskell/haskell-test-framework/haskell-test-framework.SlackBuild
index 8d018a0adc..4a32661837 100644
--- a/haskell/haskell-test-framework/haskell-test-framework.SlackBuild
+++ b/haskell/haskell-test-framework/haskell-test-framework.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for test-framework
 
-# Copyright 2011 Mikko Värri, Finland
+# Copyright 2012 Mikko Värri, Finland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=haskell-test-framework
-VERSION=${VERSION:-0.4.0}
+VERSION=${VERSION:-0.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,25 +78,26 @@ patch -p0 <$CWD/test-framework_cabal.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.lhs configure \
+runghc Setup configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \
   --enable-shared \
+  --enable-library-profiling \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --flags="Dynamic"
 
-runghc Setup.lhs build
-runghc Setup.lhs haddock
-runghc Setup.lhs copy --destdir=$PKG
-runghc Setup.lhs register --gen-pkg-config
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
 
 PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
 PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
 mkdir -p $PKG/$PKGCONFD
 mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/haskell/haskell-test-framework/haskell-test-framework.info b/haskell/haskell-test-framework/haskell-test-framework.info
index dcaa499c5e..dd914e57ae 100644
--- a/haskell/haskell-test-framework/haskell-test-framework.info
+++ b/haskell/haskell-test-framework/haskell-test-framework.info
@@ -1,10 +1,10 @@
 PRGNAM="haskell-test-framework"
-VERSION="0.4.0"
+VERSION="0.6"
 HOMEPAGE="http://hackage.haskell.org/package/test-framework"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/test-framework/0.4.0/test-framework-0.4.0.tar.gz"
-MD5SUM="abda6131d66f2c0e1014607114800a07"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/test-framework/0.6/test-framework-0.6.tar.gz"
+MD5SUM="a536da843c7494d1dddac121f7a6ff22"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/haskell/haskell-test-framework/test-framework_cabal.patch b/haskell/haskell-test-framework/test-framework_cabal.patch
index 2bc5bb37ac..5c2036a688 100644
--- a/haskell/haskell-test-framework/test-framework_cabal.patch
+++ b/haskell/haskell-test-framework/test-framework_cabal.patch
@@ -1,5 +1,5 @@
---- test-framework.cabal.orig	2011-02-04 03:59:59.000000000 +0200
-+++ test-framework.cabal	2011-02-04 04:01:17.000000000 +0200
+--- test-framework.cabal.orig	2012-05-17 17:38:22.833999961 +0300
++++ test-framework.cabal	2012-05-17 17:41:57.088000279 +0300
 @@ -21,6 +21,10 @@
          Description:    Build the tests
          Default:        False
@@ -13,10 +13,10 @@
          Exposed-Modules:        Test.Framework
 @@ -102,6 +106,8 @@
                  Cpp-Options:            -DTEST
-         
+ 
                  Ghc-Options:            -Wall -threaded
 +                if flag(Dynamic)
 +                        Ghc-Options:            -dynamic
-         
+ 
                  if impl(ghc)
                          Cpp-Options:            -DCOMPILER_GHC