diff --git a/daemon/execdriver/execdrivers/execdrivers.go b/daemon/execdriver/execdrivers/execdrivers_linux.go
similarity index 97%
rename from daemon/execdriver/execdrivers/execdrivers.go
rename to daemon/execdriver/execdrivers/execdrivers_linux.go
index dde0be1f0f..89dedc762e 100644
--- a/daemon/execdriver/execdrivers/execdrivers.go
+++ b/daemon/execdriver/execdrivers/execdrivers_linux.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package execdrivers
 
 import (
diff --git a/daemon/execdriver/execdrivers/execdrivers_windows.go b/daemon/execdriver/execdrivers/execdrivers_windows.go
new file mode 100644
index 0000000000..563961fce4
--- /dev/null
+++ b/daemon/execdriver/execdrivers/execdrivers_windows.go
@@ -0,0 +1,19 @@
+// +build windows
+
+package execdrivers
+
+import (
+	"fmt"
+
+	"github.com/docker/docker/daemon/execdriver"
+	"github.com/docker/docker/daemon/execdriver/windows"
+	"github.com/docker/docker/pkg/sysinfo"
+)
+
+func NewDriver(name, root, libPath, initPath string, sysInfo *sysinfo.SysInfo) (execdriver.Driver, error) {
+	switch name {
+	case "windows":
+		return windows.NewDriver(root, initPath)
+	}
+	return nil, fmt.Errorf("unknown exec driver %s", name)
+}