diff --git a/Gopkg.lock b/Gopkg.lock
index 4be470e7d..f5f7aad19 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -122,13 +122,14 @@
   revision = "4572e39b1ab9fe03ee513ce6fc7e289e98482190"
 
 [[projects]]
-  branch = "master"
+  branch = "non-strict"
   name = "github.com/masterzen/winrm"
   packages = [
     ".",
     "soap"
   ]
-  revision = "7e40f93ae939004a1ef3bd5ff5c88c756ee762bb"
+  revision = "d179cf2678135ef005309663bceee2058384917c"
+  source = "github.com/mkuzmin/winrm"
 
 [[projects]]
   branch = "master"
@@ -269,6 +270,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "20177d3d587549d23b3ddea4eefc1fc03aa3436c372843bc76f98052b25432b7"
+  inputs-digest = "e6e9304a6bd19a02a4b36af24d1e3195e19d459012ecb863bc685a90aab9f2ed"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 02206ea46..9e7324d6b 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -2,14 +2,19 @@
   name = "github.com/hashicorp/packer"
   version = "=1.2.2"
 
-[[override]]
-  name = "github.com/masterzen/azure-sdk-for-go"
-  branch = "master"
-
 [[constraint]]
   name = "github.com/vmware/govmomi"
   version = "=0.15.0"
 
+[[override]]
+  name = "github.com/masterzen/winrm"
+  source = "github.com/mkuzmin/winrm"
+  branch = "non-strict"
+
+[[override]]
+  name = "github.com/masterzen/azure-sdk-for-go"
+  branch = "master"
+
 [prune]
   go-tests = true
   unused-packages = true
diff --git a/examples/windows/setup/vmtools.cmd b/examples/windows/setup/vmtools.cmd
index c6256cc05..19a942d80 100644
--- a/examples/windows/setup/vmtools.cmd
+++ b/examples/windows/setup/vmtools.cmd
@@ -1,2 +1,2 @@
-rem Silent mode, basic UI, no reboot
+@rem Silent mode, basic UI, no reboot
 e:\setup64 /s /v "/qb REBOOT=R"
diff --git a/examples/windows/windows-10.json b/examples/windows/windows-10.json
index 18288dd86..5dcd0e679 100644
--- a/examples/windows/windows-10.json
+++ b/examples/windows/windows-10.json
@@ -33,7 +33,7 @@
       ],
 
       "floppy_files": [
-        "setup/"
+        "{{template_dir}}/setup/"
       ],
       "floppy_img_path": "[datastore1] ISO/VMware Tools/10.2.0/pvscsi-Windows8.flp",
       "boot_order": "disk,cdrom"