diff --git a/System/FilePath/Find.hs b/System/FilePath/Find.hs
--- a/System/FilePath/Find.hs
+++ b/System/FilePath/Find.hs
@@ -113,7 +113,7 @@
 
 import Control.Exception
 import Control.Monad (foldM, forM, liftM, liftM2)
-import Control.Monad.State (State(..), evalState)
+import Control.Monad.State (State, evalState, get)
 import Data.Bits (Bits, (.&.))
 import Data.List (sort)
 import System.Directory (getDirectoryContents)
@@ -172,13 +172,10 @@
        -> a
 evalFI m p d s = evalClause m (mkFI p d s)
 
-mkFindClause :: (FileInfo -> (a, FileInfo)) -> FindClause a
-mkFindClause = FC . State
-
 -- | Return the current 'FileInfo'.
 fileInfo :: FindClause FileInfo
 
-fileInfo = mkFindClause $ \st -> (st, st)
+fileInfo = FC $ get
 
 -- | Return the name of the file being visited.
 filePath :: FindClause FilePath
diff --git a/filemanip.cabal b/filemanip.cabal
--- a/filemanip.cabal
+++ b/filemanip.cabal
@@ -1,9 +1,11 @@
 Name:               filemanip
-Version:            0.3.5.1
+Version:            0.3.5.2
 License:            BSD3
 License-File:       LICENSE
 Author:             Bryan O'Sullivan <bos@serpentine.com>
 Maintainer:         Bryan O'Sullivan
+Homepage:           http://bitbucket.org/bos/filemanip
+Bug-reports:        http://bitbucket.org/bos/filemanip/issues
 Synopsis:           Expressive file and directory manipulation for Haskell.
 Category:           System
 Description:        A Haskell library for working with files and directories.
@@ -15,7 +17,7 @@
 Extra-Source-Files: README.markdown
 
 Library
-  build-depends: base < 5, bytestring, directory, filepath, mtl == 1.1.*, unix-compat
+  build-depends: base < 5, bytestring, directory, filepath, mtl, unix-compat
   if !os(windows)
     build-depends: unix
   if impl(ghc >= 6.10)
@@ -28,3 +30,11 @@
           System.FilePath.Glob,
           System.FilePath.GlobPattern,
           System.FilePath.Manip
+
+source-repository head
+  type:     mercurial
+  location: http://bitbucket.org/bos/filemanip
+
+source-repository head
+  type:     git
+  location: http://github.com/bos/filemanip