diff --git a/b9.cabal b/b9.cabal
--- a/b9.cabal
+++ b/b9.cabal
@@ -1,5 +1,5 @@
 name:                b9
-version:             0.5.3
+version:             0.5.4
 
 synopsis:            A tool and library for building virtual machine images.
 
diff --git a/src/lib/B9/B9Monad.hs b/src/lib/B9/B9Monad.hs
--- a/src/lib/B9/B9Monad.hs
+++ b/src/lib/B9/B9Monad.hs
@@ -59,8 +59,9 @@
 
   where
     run' buildId now buildDir = do
+      maybe (return ()) setCurrentDirectory (buildDirRoot cfg)
       -- Check repositories
-      repoCache <- initRepoCache (maybe defaultRepositoryCache id (repositoryCache cfg))
+      repoCache <- initRepoCache (fromMaybe defaultRepositoryCache (repositoryCache cfg))
       let remoteRepos = getConfiguredRemoteRepos cfgParser
       remoteRepos' <- mapM (initRemoteRepo repoCache) remoteRepos
       let ctx = BuildState
diff --git a/src/lib/B9/Builder.hs b/src/lib/B9/Builder.hs
--- a/src/lib/B9/Builder.hs
+++ b/src/lib/B9/Builder.hs
@@ -28,6 +28,8 @@
 import Data.Monoid
 import Text.Printf ( printf )
 import Text.Show.Pretty (ppShow)
+import Control.Monad.IO.Class
+import System.Directory
 
 import B9.B9Monad
 import B9.ConfigUtils
@@ -55,6 +57,7 @@
 buildArtifacts artifactGenerator cfgParser cliCfg =
   withB9Config cfgParser cliCfg $ \cfg ->
     run cfgParser cfg $ do
+      traceL =<< liftIO getCurrentDirectory
       infoL "BUILDING ARTIFACTS"
       getConfig >>= traceL . printf "USING BUILD CONFIGURATION: %v" . ppShow
       assemble artifactGenerator