diff --git a/docker/daemon.go b/docker/daemon.go
index aa2bd54a33..6ea6cb5b94 100644
--- a/docker/daemon.go
+++ b/docker/daemon.go
@@ -8,7 +8,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"time"
 
@@ -319,11 +318,3 @@ func shutdownDaemon(d *daemon.Daemon, timeout time.Duration) {
 		logrus.Error("Force shutdown daemon")
 	}
 }
-
-func getDaemonConfDir() string {
-	// TODO: update for Windows daemon
-	if runtime.GOOS == "windows" {
-		return cliconfig.ConfigDir()
-	}
-	return "/etc/docker"
-}
diff --git a/docker/daemon_unix.go b/docker/daemon_unix.go
index beaffc4506..3ea96a7b08 100644
--- a/docker/daemon_unix.go
+++ b/docker/daemon_unix.go
@@ -44,3 +44,7 @@ func setDefaultUmask() error {
 
 	return nil
 }
+
+func getDaemonConfDir() string {
+	return "/etc/docker"
+}
diff --git a/docker/daemon_windows.go b/docker/daemon_windows.go
index 82c4e264a5..6e139b1948 100644
--- a/docker/daemon_windows.go
+++ b/docker/daemon_windows.go
@@ -3,6 +3,8 @@
 package main
 
 import (
+	"os"
+
 	apiserver "github.com/docker/docker/api/server"
 	"github.com/docker/docker/daemon"
 )
@@ -21,3 +23,7 @@ func currentUserIsOwner(f string) bool {
 func setDefaultUmask() error {
 	return nil
 }
+
+func getDaemonConfDir() string {
+	return os.Getenv("PROGRAMDATA") + `\docker\config`
+}