diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+* v0.4.1, 2010-08-31
+	- Only depend on QuickCheck when building the test target
+
 * v0.4.1, 2010-03-26
 	- Fix building test and coverage targets
 
diff --git a/Network/MPD.hs b/Network/MPD.hs
--- a/Network/MPD.hs
+++ b/Network/MPD.hs
@@ -26,7 +26,7 @@
 
 import Control.Monad (liftM)
 import System.Environment (getEnv)
-import System.IO.Error (isDoesNotExistError, ioError)
+import System.IO.Error (isDoesNotExistError)
 
 -- | A wrapper for 'withMPDEx' that uses localhost:6600 as the default
 -- host:port, or whatever is found in the environment variables MPD_HOST and
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -11,10 +11,9 @@
 
 ## Getting
 * [Latest release]
-* `git clone git://github.com/bens/libmpd-haskell.git`
+* `git clone git://github.com/joachifm/libmpd-haskell.git`
 
 [Latest release]: http://hackage.haskell.org/package/libmpd
-[GIT repository]: git://github.com/bens/libmpd-haskell.git
 
 ## Building
 The preferred method of building libmpd-haskell is using [cabal-install], which
@@ -30,6 +29,11 @@
 
 [cabal-install]: http://hackage.haskell.org/package/cabal-install
 
+## Running tests
+To run the libmpd testsuite, do:
+
+`./tests/run-tests.lhs`
+
 ## Compiler support
 We try to support the two last major versions of GHC, but only the latest
 version is actually tested for.
@@ -53,7 +57,7 @@
 To start developing libmpd-haskell you'll first need a clone of the
 source code repository:
 
-`git clone git://github.com/joachifm/libmpd-haskell`
+`git clone git://github.com/joachifm/libmpd-haskell.git`
 
 To pull in new changes from upstream, use:
 
@@ -63,6 +67,8 @@
 surrounding style. If you introduce new functionality, please include
 a test case or at least document the expected behavior.
 
+To set up GIT hooks, see `hooks/README` in the source distribution.
+
 ### Submitting patches
 To submit a patch, use `git format-patch` and email the resulting
 file to one of the developers or upload it to the [bug tracker].
@@ -82,14 +88,14 @@
 
 [bug tracker]: http://trac.haskell.org/libmpd/
 [GitHub]: http://www.github.com
-[repository]: http://www.github.com/bens/libmpd-haskell
+[repository]: http://www.github.com/joachifm/libmpd-haskell
 [API documentation]: http://projects.haskell.org/libmpd/doc/
 [Code coverage]: http://projects.haskell.org/libmpd/coverage/hpc_index.html
 [Protocol reference]: http://www.musicpd.org/doc/protocol/
 [Using GitHub]: http://help.github.com
 
 ## License
-LGPL version 2.1
+LGPL version 2.1 (see LICENSE)
 
 ## Authors
 Ben Sinclair \<ben.d.sinclair@gmail.com\>
diff --git a/libmpd.cabal b/libmpd.cabal
--- a/libmpd.cabal
+++ b/libmpd.cabal
@@ -1,5 +1,5 @@
 Name:               libmpd
-Version:            0.4.1
+Version:            0.4.2
 License:            LGPL
 License-file:       LICENSE
 Copyright:          Ben Sinclair 2005-2009, Joachim Fasting 2010
@@ -7,15 +7,14 @@
 Maintainer:         Joachim Fasting <joachim.fasting@gmail.com>
 Stability:          beta
 Homepage:           http://github.com/joachifm/libmpd-haskell
--- Full of spam
---Bug-reports:        http://trac.haskell.org/libmpd/newticket
+Bug-reports:        http://trac.haskell.org/libmpd/newticket
 Synopsis:           An MPD client library.
 Description:        A client library for MPD, the Music Player Daemon
                     (<http://www.musicpd.org/>).
 Category:           Network, Sound
 Tested-With:        GHC == 6.10.1, GHC == 6.12.1
 Build-Type:         Simple
-Cabal-Version:      >= 1.6 && < 1.9
+Cabal-Version:      >= 1.6
 Extra-Source-Files: README.md ChangeLog tests/Properties.hs tests/Commands.hs
                     tests/Main.hs tests/Displayable.hs tests/run-tests.lhs
                     tests/coverage.lhs
@@ -62,8 +61,9 @@
 Executable test
     Hs-Source-Dirs:     . tests
     Main-Is:            tests/Main.hs
-    Build-Depends:      base ==4.*, network, mtl, filepath, utf8-string,
-                        QuickCheck ==2.1.*
+    Build-Depends:      base ==4.*, network, mtl, filepath, utf8-string
+    if flag(test)
+        Build-Depends: QuickCheck ==2.1.*
     ghc-options:        -Wall -Werror -fno-warn-warnings-deprecations
                         -fno-warn-type-defaults
 
diff --git a/tests/coverage.lhs b/tests/coverage.lhs
--- a/tests/coverage.lhs
+++ b/tests/coverage.lhs
@@ -7,8 +7,8 @@
 import Control.Monad (when)
 import System.Cmd (system)
 import System.Exit (ExitCode(..), exitWith)
-import System.FilePath ((</>))
-import System.Directory (doesDirectoryExist, getDirectoryContents, removeDirectory, removeFile)
+import System.Directory (doesDirectoryExist, removeDirectoryRecursive,
+                         removeFile)
 
 excludeModules =
     ["Main", "Arbitrary", "Properties", "Displayable", "Commands", "StringConn"]
@@ -17,10 +17,7 @@
     -- Cleanup from previous runs
     hpcExists <- doesDirectoryExist ".hpc"
     when hpcExists $ do
-        cs <- getDirectoryContents ".hpc"
-        let fs = map (".hpc" </>) (filter (`notElem` [".", ".."]) cs)
-        mapM_ removeFile fs
-        removeDirectory ".hpc"
+        removeDirectoryRecursive ".hpc"
         removeFile "test.tix"
 
     -- Build and generate coverage report