diff --git a/Setup.hs b/Setup.hs
--- a/Setup.hs
+++ b/Setup.hs
@@ -11,6 +11,7 @@
 import Data.IORef
 import Data.Char
 import Data.Maybe
+import System.Directory
 
 main = defaultMainWithHooks simpleUserHooks {
                       postConf    = defaultPostConf,
@@ -47,10 +48,12 @@
           docdir = fromMaybe base_html $
                         fmap reverse (stripPrefix (reverse "/libraries/base")
                                                   (reverse base_html))
+      c_ghc_pkg <- canonicalizePath ghc_pkg
+      c_ghc     <- canonicalizePath ghc
 
       let buildinfo = emptyBuildInfo{
-               cppOptions = ["-DGHC_PATHS_GHC_PKG=" ++ show ghc_pkg,
-                             "-DGHC_PATHS_GHC=" ++ show ghc,
+               cppOptions = ["-DGHC_PATHS_GHC_PKG=" ++ show c_ghc_pkg,
+                             "-DGHC_PATHS_GHC=" ++ show c_ghc,
                              "-DGHC_PATHS_LIBDIR=" ++ show libdir,
                              "-DGHC_PATHS_DOCDIR=" ++ show docdir ]
              }
diff --git a/ghc-paths.cabal b/ghc-paths.cabal
--- a/ghc-paths.cabal
+++ b/ghc-paths.cabal
@@ -1,5 +1,5 @@
 name: ghc-paths
-version: 0.1.0.8
+version: 0.1.0.9
 license: BSD3
 license-file: LICENSE
 copyright: (c) Simon Marlow
@@ -17,6 +17,5 @@
         exposed-modules: GHC.Paths
 
 source-repository head
-  type:     darcs
-  location: http://darcs.haskell.org/ghc-paths
-
+  type:     git
+  location: https://github.com/simonmar/ghc-paths