diff --git a/cabal-cargs.cabal b/cabal-cargs.cabal
--- a/cabal-cargs.cabal
+++ b/cabal-cargs.cabal
@@ -1,5 +1,5 @@
 name: cabal-cargs
-version: 0.6
+version: 0.6.1
 cabal-version: >=1.9.2
 build-type: Simple
 license: BSD3
diff --git a/lib/CabalCargs/Format.hs b/lib/CabalCargs/Format.hs
--- a/lib/CabalCargs/Format.hs
+++ b/lib/CabalCargs/Format.hs
@@ -22,7 +22,7 @@
                           , formatIncludeDirs $ includeDirs cargs
                           , formatIncludes $ includes cargs
                           , formatBuildDepends $ buildDepends cargs
-                          , maybe [] (\db -> ["-package-conf=" ++ db]) (packageDB cargs)
+                          , maybe [] (\db -> ["-package-db=" ++ db]) (packageDB cargs)
                           , formatHsSourceDirs $ autogenHsSourceDirs cargs
                           , formatIncludeDirs $ autogenIncludeDirs cargs
                           , formatIncludes $ autogenIncludes cargs
diff --git a/tests/goldenFiles/withSandbox/AllOfExe.txt b/tests/goldenFiles/withSandbox/AllOfExe.txt
--- a/tests/goldenFiles/withSandbox/AllOfExe.txt
+++ b/tests/goldenFiles/withSandbox/AllOfExe.txt
@@ -1,1 +1,1 @@
--iexe -W -optP-DEXE -package=base -package=cabal-cargs -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-iexe -W -optP-DEXE -package=base -package=cabal-cargs -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/AllOfLib.txt b/tests/goldenFiles/withSandbox/AllOfLib.txt
--- a/tests/goldenFiles/withSandbox/AllOfLib.txt
+++ b/tests/goldenFiles/withSandbox/AllOfLib.txt
@@ -1,1 +1,1 @@
--ilib -W -optP-DLIB -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -W -optP-DLIB -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/AllOfTest.txt b/tests/goldenFiles/withSandbox/AllOfTest.txt
--- a/tests/goldenFiles/withSandbox/AllOfTest.txt
+++ b/tests/goldenFiles/withSandbox/AllOfTest.txt
@@ -1,1 +1,1 @@
--itests -W -package=base -package=tasty -package=tasty-golden -package=filepath -package=cabal-cargs -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-itests -W -package=base -package=tasty -package=tasty-golden -package=filepath -package=cabal-cargs -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/AllSections.txt b/tests/goldenFiles/withSandbox/AllSections.txt
--- a/tests/goldenFiles/withSandbox/AllSections.txt
+++ b/tests/goldenFiles/withSandbox/AllSections.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/DisableFlag.txt b/tests/goldenFiles/withSandbox/DisableFlag.txt
--- a/tests/goldenFiles/withSandbox/DisableFlag.txt
+++ b/tests/goldenFiles/withSandbox/DisableFlag.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/EnableAndDisableFlag.txt b/tests/goldenFiles/withSandbox/EnableAndDisableFlag.txt
--- a/tests/goldenFiles/withSandbox/EnableAndDisableFlag.txt
+++ b/tests/goldenFiles/withSandbox/EnableAndDisableFlag.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DEXE -optP-DTEST -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DEXE -optP-DTEST -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/EnableFlag.txt b/tests/goldenFiles/withSandbox/EnableFlag.txt
--- a/tests/goldenFiles/withSandbox/EnableFlag.txt
+++ b/tests/goldenFiles/withSandbox/EnableFlag.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -optP-DTEST -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -optP-DTEST -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/FindCabalFile.txt b/tests/goldenFiles/withSandbox/FindCabalFile.txt
--- a/tests/goldenFiles/withSandbox/FindCabalFile.txt
+++ b/tests/goldenFiles/withSandbox/FindCabalFile.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/FindCabalFileHdevtools.txt b/tests/goldenFiles/withSandbox/FindCabalFileHdevtools.txt
--- a/tests/goldenFiles/withSandbox/FindCabalFileHdevtools.txt
+++ b/tests/goldenFiles/withSandbox/FindCabalFileHdevtools.txt
@@ -1,1 +1,1 @@
--g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g-package=base -g-package=cmdargs -g-package=lens -g-package=directory -g-package=strict -g-package=transformers -g-package=either -g-package=text -g-package=system-filepath -g-package=system-fileio -g-package=Cabal -g-package=cabal-cargs -g-package=tasty -g-package=tasty-golden -g-package=filepath -g-package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
+-g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g-package=base -g-package=cmdargs -g-package=lens -g-package=directory -g-package=strict -g-package=transformers -g-package=either -g-package=text -g-package=system-filepath -g-package=system-fileio -g-package=Cabal -g-package=cabal-cargs -g-package=tasty -g-package=tasty-golden -g-package=filepath -g-package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
diff --git a/tests/goldenFiles/withSandbox/FromCabalFile.txt b/tests/goldenFiles/withSandbox/FromCabalFile.txt
--- a/tests/goldenFiles/withSandbox/FromCabalFile.txt
+++ b/tests/goldenFiles/withSandbox/FromCabalFile.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package=cabal-cargs -package=tasty -package=tasty-golden -package=filepath -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/FromCabalFileHdevtools.txt b/tests/goldenFiles/withSandbox/FromCabalFileHdevtools.txt
--- a/tests/goldenFiles/withSandbox/FromCabalFileHdevtools.txt
+++ b/tests/goldenFiles/withSandbox/FromCabalFileHdevtools.txt
@@ -1,1 +1,1 @@
--g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g-package=base -g-package=cmdargs -g-package=lens -g-package=directory -g-package=strict -g-package=transformers -g-package=either -g-package=text -g-package=system-filepath -g-package=system-fileio -g-package=Cabal -g-package=cabal-cargs -g-package=tasty -g-package=tasty-golden -g-package=filepath -g-package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
+-g-ilib -g-iexe -g-itests -g-W -g-optP-DLIB -g-optP-DEXE -g-package=base -g-package=cmdargs -g-package=lens -g-package=directory -g-package=strict -g-package=transformers -g-package=either -g-package=text -g-package=system-filepath -g-package=system-fileio -g-package=Cabal -g-package=cabal-cargs -g-package=tasty -g-package=tasty-golden -g-package=filepath -g-package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
diff --git a/tests/goldenFiles/withSandbox/FromExeSrcFile.txt b/tests/goldenFiles/withSandbox/FromExeSrcFile.txt
--- a/tests/goldenFiles/withSandbox/FromExeSrcFile.txt
+++ b/tests/goldenFiles/withSandbox/FromExeSrcFile.txt
@@ -1,1 +1,1 @@
--iexe -W -optP-DEXE -package=base -package=cabal-cargs -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-iexe -W -optP-DEXE -package=base -package=cabal-cargs -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/FromExeSrcFileHdevtools.txt b/tests/goldenFiles/withSandbox/FromExeSrcFileHdevtools.txt
--- a/tests/goldenFiles/withSandbox/FromExeSrcFileHdevtools.txt
+++ b/tests/goldenFiles/withSandbox/FromExeSrcFileHdevtools.txt
@@ -1,1 +1,1 @@
--g-iexe -g-W -g-optP-DEXE -g-package=base -g-package=cabal-cargs -g-package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
+-g-iexe -g-W -g-optP-DEXE -g-package=base -g-package=cabal-cargs -g-package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
diff --git a/tests/goldenFiles/withSandbox/FromLibSrcFile.txt b/tests/goldenFiles/withSandbox/FromLibSrcFile.txt
--- a/tests/goldenFiles/withSandbox/FromLibSrcFile.txt
+++ b/tests/goldenFiles/withSandbox/FromLibSrcFile.txt
@@ -1,1 +1,1 @@
--ilib -W -optP-DLIB -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -W -optP-DLIB -package=base -package=cmdargs -package=lens -package=directory -package=strict -package=transformers -package=either -package=text -package=system-filepath -package=system-fileio -package=Cabal -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
diff --git a/tests/goldenFiles/withSandbox/FromLibSrcFileHdevtools.txt b/tests/goldenFiles/withSandbox/FromLibSrcFileHdevtools.txt
--- a/tests/goldenFiles/withSandbox/FromLibSrcFileHdevtools.txt
+++ b/tests/goldenFiles/withSandbox/FromLibSrcFileHdevtools.txt
@@ -1,1 +1,1 @@
--g-ilib -g-W -g-optP-DLIB -g-package=base -g-package=cmdargs -g-package=lens -g-package=directory -g-package=strict -g-package=transformers -g-package=either -g-package=text -g-package=system-filepath -g-package=system-fileio -g-package=Cabal -g-package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
+-g-ilib -g-W -g-optP-DLIB -g-package=base -g-package=cmdargs -g-package=lens -g-package=directory -g-package=strict -g-package=transformers -g-package=either -g-package=text -g-package=system-filepath -g-package=system-fileio -g-package=Cabal -g-package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -g-idist/dist-sandbox-6d1acfa0/build/autogen -g-Idist/dist-sandbox-6d1acfa0/build/autogen -g-optP-include -g-optPcabal_macros.h --socket=.hdevtools.sock
diff --git a/tests/goldenFiles/withSandbox/IgnoreBuildDepends.txt b/tests/goldenFiles/withSandbox/IgnoreBuildDepends.txt
--- a/tests/goldenFiles/withSandbox/IgnoreBuildDepends.txt
+++ b/tests/goldenFiles/withSandbox/IgnoreBuildDepends.txt
@@ -1,1 +1,1 @@
--ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package-conf=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h
+-ilib -iexe -itests -W -optP-DLIB -optP-DEXE -package-db=.cabal-sandbox/x86_64-linux-ghc-7.6.2-packages.conf.d -idist/dist-sandbox-6d1acfa0/build/autogen -Idist/dist-sandbox-6d1acfa0/build/autogen -optP-include -optPcabal_macros.h