diff --git a/commands.go b/commands.go
index 4d311aaf9d..fb77cd0184 100644
--- a/commands.go
+++ b/commands.go
@@ -18,7 +18,6 @@ import (
 	_ "github.com/docker/machine/drivers/azure"
 	_ "github.com/docker/machine/drivers/digitalocean"
 	_ "github.com/docker/machine/drivers/google"
-	_ "github.com/docker/machine/drivers/hyperv"
 	_ "github.com/docker/machine/drivers/none"
 	_ "github.com/docker/machine/drivers/openstack"
 	_ "github.com/docker/machine/drivers/rackspace"
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv_windows.go
similarity index 99%
rename from drivers/hyperv/hyperv.go
rename to drivers/hyperv/hyperv_windows.go
index a17517eedc..e2b3e8570f 100644
--- a/drivers/hyperv/hyperv.go
+++ b/drivers/hyperv/hyperv_windows.go
@@ -211,7 +211,7 @@ func (d *Driver) Create() error {
 
 	log.Infof("Adding key to authorized-keys.d...")
 
-	if err := drivers.AddPublicKeyToAuthorizedHosts(d, "/root/.docker/authorized-keys.d"); err != nil {
+	if err := drivers.AddPublicKeyToAuthorizedHosts(d, "/var/lib/docker/auth.d"); err != nil {
 		return err
 	}
 
diff --git a/drivers/hyperv/powershell.go b/drivers/hyperv/powershell_windows.go
similarity index 100%
rename from drivers/hyperv/powershell.go
rename to drivers/hyperv/powershell_windows.go
diff --git a/imports_windows.go b/imports_windows.go
new file mode 100644
index 0000000000..883462072b
--- /dev/null
+++ b/imports_windows.go
@@ -0,0 +1,3 @@
+package main
+
+import _ "github.com/docker/machine/drivers/hyperv"