diff --git a/.gitignore b/.gitignore
index 14c7815ea8e87503dca21723055edbed3c25ef99..21e34b18579f9b382cc06597d467d80dd4a20299 100644
--- a/.gitignore
+++ b/.gitignore
@@ -189,6 +189,7 @@ _darcs/
 /utils/mkUserGuidePart/mkUserGuidePart.cabal
 /utils/runghc/runghc.cabal
 /utils/gen-dll/gen-dll.cabal
+/utils/ghc-pkg/ghc-pkg.cabal
 utils/lndir/fs.*
 utils/unlit/fs.*
 rts/fs.*
diff --git a/configure.ac b/configure.ac
index 04c9c972b8a4402e0d1b8a8b21699809a6fa21c0..50b7edb453751f342ea136f57659032e8eae85ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1500,7 +1500,7 @@ checkMake380() {
 checkMake380 make
 checkMake380 gmake
 
-AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/remote-iserv/remote-iserv.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal libraries/template-haskell/template-haskell.cabal docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
+AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk rts/rts.cabal compiler/ghc.cabal ghc/ghc-bin.cabal utils/iserv/iserv.cabal utils/iserv-proxy/iserv-proxy.cabal utils/ghc-pkg/ghc-pkg.cabal utils/remote-iserv/remote-iserv.cabal utils/runghc/runghc.cabal utils/gen-dll/gen-dll.cabal libraries/ghc-boot/ghc-boot.cabal libraries/ghc-boot-th/ghc-boot-th.cabal libraries/ghci/ghci.cabal libraries/ghc-heap/ghc-heap.cabal libraries/libiserv/libiserv.cabal libraries/template-haskell/template-haskell.cabal docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
 AC_OUTPUT
 [
 if test "$print_make_warning" = "true"; then
diff --git a/hadrian/src/Rules/Configure.hs b/hadrian/src/Rules/Configure.hs
index 931801be5dfb496b50946bcf08b8aede651937b3..258bd40a7dd4d9d2418b9bc91ea5856aefc75154 100644
--- a/hadrian/src/Rules/Configure.hs
+++ b/hadrian/src/Rules/Configure.hs
@@ -14,7 +14,7 @@ import qualified System.Info.Extra as System
 -- | Files generated by running the @configure@ script.
 configureResults :: [FilePath]
 configureResults =
-    [ configFile, configH, "compiler/ghc.cabal", "rts/rts.cabal"]
+    [ configFile, configH, "compiler/ghc.cabal", "rts/rts.cabal", "utils/ghc-pkg/ghc-pkg.cabal"]
 
 configureRules :: Rules ()
 configureRules = do
diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal.in
similarity index 97%
rename from utils/ghc-pkg/ghc-pkg.cabal
rename to utils/ghc-pkg/ghc-pkg.cabal.in
index 13f47c0c3e87e5ee7359e65d0b3878550fa4e4a8..d299c98372f349ec1291f2b64a92aa1319a4baf9 100644
--- a/utils/ghc-pkg/ghc-pkg.cabal
+++ b/utils/ghc-pkg/ghc-pkg.cabal.in
@@ -1,6 +1,6 @@
 Name: ghc-pkg
 -- XXX Version number
-Version: 6.9
+Version: @ProjectVersion@
 Copyright: XXX
 License: BSD3
 -- XXX License-File: LICENSE