diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+## 0.1.0.4
+
+* Use ~/.stackage/upload
+
 ## 0.1.0.3
 
 * Allow uploading directories as well, see [Reddit discussion](http://www.reddit.com/r/haskell/comments/344dig/announcing_stackageupload/cqr6mvv)
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # stackage-upload
 
+[![Build Status](https://travis-ci.org/fpco/stackage-upload.svg?branch=master)](https://travis-ci.org/fpco/stackage-upload)
+
 `stackage-upload` provides a more secure version of the `cabal upload` command
 by using HTTPS. When uploading a package to Hackage, `cabal upload` will
 perform the upload in plain-text via unencrypted HTTP, using [basic
diff --git a/Stackage/Upload.hs b/Stackage/Upload.hs
--- a/Stackage/Upload.hs
+++ b/Stackage/Upload.hs
@@ -58,7 +58,7 @@
                                                         doesDirectoryExist,
                                                         doesFileExist,
                                                         getAppUserDataDirectory,
-                                                        getDirectoryContents,
+                                                        getDirectoryContents, removeDirectoryRecursive,
                                                         removeFile)
 import           System.Exit                           (ExitCode (ExitSuccess))
 import           System.FilePath                       (takeExtension, (</>))
@@ -136,7 +136,13 @@
 
 credsFile :: IO FilePath
 credsFile = do
-    dir <- getAppUserDataDirectory "stackage-upload"
+    olddir <- getAppUserDataDirectory "stackage-upload"
+    exists <- doesDirectoryExist olddir
+    when exists $ do
+        putStrLn $ "Removing old config directory: " ++ olddir
+        removeDirectoryRecursive olddir
+
+    dir <- fmap (</> "upload") $ getAppUserDataDirectory "stackage"
     createDirectoryIfMissing True dir
     return $ dir </> "credentials.json"
 
diff --git a/stackage-upload.cabal b/stackage-upload.cabal
--- a/stackage-upload.cabal
+++ b/stackage-upload.cabal
@@ -1,5 +1,5 @@
 name:                stackage-upload
-version:             0.1.0.3
+version:             0.1.0.4
 synopsis:            A more secure version of cabal upload which uses HTTPS
 description:         For more information, see <https://www.stackage.org/package/stackage-upload>
 homepage:            https://github.com/fpco/stackage-upload