diff --git a/gitlib-cmdline/Setup.hs b/gitlib-cmdline/Setup.hs
index 2e497053..bf689019 100644
--- a/gitlib-cmdline/Setup.hs
+++ b/gitlib-cmdline/Setup.hs
@@ -1,6 +1,2 @@
-import           Distribution.Simple
-import           Distribution.Simple.Program
-
-main :: IO ()
-main = defaultMainWithHooks simpleUserHooks
-       { hookedPrograms = [ simpleProgram "git" ]}
+import Distribution.Simple
+main = defaultMain
\ No newline at end of file
diff --git a/gitlib-cmdline/gitlib-cmdline.cabal b/gitlib-cmdline/gitlib-cmdline.cabal
index f4a9219c..7053976e 100644
--- a/gitlib-cmdline/gitlib-cmdline.cabal
+++ b/gitlib-cmdline/gitlib-cmdline.cabal
@@ -6,7 +6,7 @@ License-file:        LICENSE
 License:             MIT
 Author:              John Wiegley
 Maintainer:          johnw@newartisans.com
-Build-Type:          Custom
+Build-Type:          Simple
 Cabal-Version:       >=1.10
 Category:            Git
 
diff --git a/hlibgit2/Setup.hs b/hlibgit2/Setup.hs
index 2e497053..bf689019 100644
--- a/hlibgit2/Setup.hs
+++ b/hlibgit2/Setup.hs
@@ -1,6 +1,2 @@
-import           Distribution.Simple
-import           Distribution.Simple.Program
-
-main :: IO ()
-main = defaultMainWithHooks simpleUserHooks
-       { hookedPrograms = [ simpleProgram "git" ]}
+import Distribution.Simple
+main = defaultMain
\ No newline at end of file
diff --git a/hlibgit2/hlibgit2.cabal b/hlibgit2/hlibgit2.cabal
index 31162845..aca6a6c1 100644
--- a/hlibgit2/hlibgit2.cabal
+++ b/hlibgit2/hlibgit2.cabal
@@ -6,7 +6,7 @@ License-file:        LICENSE
 License:             MIT
 Author:              John Wiegley, Sakari Jokinen, Jacob Stanleyyeah,
 Maintainer:          johnw@newartisans.com
-Build-Type:          Custom
+Build-Type:          Simple
 Cabal-Version:       >=1.10
 Category:            FFI