diff --git a/Crypto/PasswordStore.hs b/Crypto/PasswordStore.hs
--- a/Crypto/PasswordStore.hs
+++ b/Crypto/PasswordStore.hs
@@ -93,6 +93,7 @@
 import System.IO
 import System.Random
 import Data.Maybe
+import qualified Control.Exception
 
 ---------------------
 -- Cryptographic base
@@ -120,7 +121,11 @@
 -- system RNG as a fallback. This is the function used to generate salts by
 -- 'makePassword'.
 genSaltIO :: IO Salt
-genSaltIO = catch genSaltDevURandom (\_ -> genSaltSysRandom)
+genSaltIO =
+    Control.Exception.catch genSaltDevURandom def
+  where
+    def :: IOError -> IO Salt
+    def _ = genSaltSysRandom
 
 -- | Generate a 'Salt' from @\/dev\/urandom@.
 genSaltDevURandom :: IO Salt
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
 
     cabal-install pwstore-fast
 
-[Haddoc docs are here.](http://hackage.haskell.org/packages/archive/pwstore-fast/2.0/doc/html/Crypto-PasswordStore.html)
+[Haddock docs are here.](http://hackage.haskell.org/packages/archive/pwstore-fast/2.0/doc/html/Crypto-PasswordStore.html)
 
 
 Usage
@@ -47,6 +47,11 @@
     True
 
 These two functions are really all you need. If you want to make existing password hashes stronger, you can use `strengthenPassword`. Just pass it an existing password hash and a new strength value, and it will return a new password hash with that strength value, which will match the same password as the old password hash.
+
+Tools
+-----
+
+Robert Helgesson has written a command-line tool for using pwstore, called [pwstore-cli](http://darcsden.com/rycee/pwstore-cli). It is available [on Hackage](http://hackage.haskell.org/package/pwstore-cli-0.1), and can be easily installed with `cabal install pwstore-cli`.
 
 Contributing
 ------
diff --git a/pwstore-fast.cabal b/pwstore-fast.cabal
--- a/pwstore-fast.cabal
+++ b/pwstore-fast.cabal
@@ -1,5 +1,5 @@
 Name:                pwstore-fast
-Version:             2.2
+Version:             2.3
 Synopsis:            Secure password storage.
 Description:         To store passwords securely, they should be salted,
                      then hashed with a slow hash function. This library
@@ -18,7 +18,11 @@
 Category:            Cryptography
 Build-type:          Simple
 Extra-source-files:  README.md
-Cabal-version:       >=1.2
+Cabal-version:       >=1.6
+
+Source-repository head
+  type:     git
+  location: https://github.com/PeterScott/pwstore
 
 
 Library