diff --git a/docs/auth.go b/docs/auth.go
index bccf58fc5..ef4985abc 100644
--- a/docs/auth.go
+++ b/docs/auth.go
@@ -261,7 +261,7 @@ func (configFile *ConfigFile) Save() error {
 		return err
 	}
 
-	if err := os.MkdirAll(filepath.Dir(configFile.filename), 0600); err != nil {
+	if err := os.MkdirAll(filepath.Dir(configFile.filename), 0700); err != nil {
 		return err
 	}
 
diff --git a/docs/config_file_test.go b/docs/config_file_test.go
index 9abb8ee95..6f8bd74f5 100644
--- a/docs/config_file_test.go
+++ b/docs/config_file_test.go
@@ -31,6 +31,28 @@ func TestMissingFile(t *testing.T) {
 	}
 }
 
+func TestSaveFileToDirs(t *testing.T) {
+	tmpHome, _ := ioutil.TempDir("", "config-test")
+
+	tmpHome += "/.docker"
+
+	config, err := LoadConfig(tmpHome)
+	if err != nil {
+		t.Fatalf("Failed loading on missing file: %q", err)
+	}
+
+	// Now save it and make sure it shows up in new form
+	err = config.Save()
+	if err != nil {
+		t.Fatalf("Failed to save: %q", err)
+	}
+
+	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, CONFIGFILE))
+	if !strings.Contains(string(buf), `"auths":`) {
+		t.Fatalf("Should have save in new form: %s", string(buf))
+	}
+}
+
 func TestEmptyFile(t *testing.T) {
 	tmpHome, _ := ioutil.TempDir("", "config-test")
 	fn := filepath.Join(tmpHome, CONFIGFILE)