diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,18 +1,25 @@
 import Control.Monad ( unless )
 import Distribution.Simple
+import Distribution.Simple.Program.Types ( Program(..), simpleProgram )
 import Distribution.PackageDescription ( PackageDescription(..), executables,
                                          hsSourceDirs, exeName, buildInfo )
 import Distribution.Simple.LocalBuildInfo ( LocalBuildInfo, buildDir )
 import Distribution.Simple.Setup ( BuildFlags, buildVerbose )
-
-import Distribution.Simple.Utils ( rawSystemExit )
+import Distribution.Simple.Utils ( rawSystemExit, findProgramVersion)
 import Distribution.Verbosity ( Verbosity )
 
 import System.Directory ( doesDirectoryExist )
 import System.FilePath ( (</>) )
 
 main = defaultMainWithHooks $
-       simpleUserHooks { buildHook = getCabalInstallSource }
+       simpleUserHooks { buildHook = getCabalInstallSource
+                       , hookedPrograms = [cabalInstallProgram] }
+
+
+cabalInstallProgram :: Program
+cabalInstallProgram = (simpleProgram "cabal") {
+  programFindVersion = findProgramVersion "--numeric-version" id
+  }
 
 getCabalInstallSource :: PackageDescription -> LocalBuildInfo -> UserHooks
                       -> BuildFlags -> IO ()
diff --git a/cabal-dev.cabal b/cabal-dev.cabal
--- a/cabal-dev.cabal
+++ b/cabal-dev.cabal
@@ -1,5 +1,5 @@
 Name:                cabal-dev
-Version:             0.7
+Version:             0.7.1
 Synopsis:            Manage sandboxed Haskell build environments
 
 Description:         cabal-dev is a tool for managing development builds of
@@ -31,14 +31,19 @@
 License-file:        LICENSE
 Author:              Josh Hoyt, Jonathan Daughtery, Rogan Creswick
 Maintainer:          j3h@galois.com, jtd@galois.com, creswick@galois.com
+Homepage:            https://github.com/creswick/cabal-dev
 Copyright:           2010 Galois, Inc.
 Category:            Development
 Build-type:          Custom
-Cabal-version:       >=1.2
+Cabal-version:       >=1.6
 Data-Files:
   admin/cabal-config.in,
   admin/00-index.tar
 
+source-repository head
+  type:        git
+  location:    git@github.com:creswick/cabal-dev.git
+
 Flag no-cabal-dev
   Description: Do not build cabal-dev (just build ghc-pkg-6_8-compat).
                This is useful for bootstrapping on GHC 6.8.
@@ -123,6 +128,9 @@
 
   if os(windows)
      build-depends: Win32 >= 2.1  && < 2.3
+
+  Build-tools:
+    cabal >= 0.8.2
 
   Other-modules:
     Distribution.Dev.AddSource,