diff --git a/.gitignore b/.gitignore
index cceb7dd93..64bf02dea 100755
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@
/windows/WebUIWrapper/bin
/windows/WebUIWrapper/obj
node_modules
+/ZeroTier One.msi
+/ext/installfiles/windows/*-cache
diff --git a/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi
new file mode 100644
index 000000000..7e6fc4267
Binary files /dev/null and b/ext/bin/tap-windows-ndis6/x64/ZeroTierOne_NDIS6_x64.msi differ
diff --git a/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip
new file mode 100644
index 000000000..744a32c58
--- /dev/null
+++ b/ext/installfiles/windows/ZeroTier One Virtual Network Port (NDIS6_x64).aip
@@ -0,0 +1,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ext/installfiles/windows/ZeroTier One.aip b/ext/installfiles/windows/ZeroTier One.aip
index a5e62a247..59d58b1a9 100644
--- a/ext/installfiles/windows/ZeroTier One.aip
+++ b/ext/installfiles/windows/ZeroTier One.aip
@@ -1,29 +1,32 @@
-
+
-
+
+
+
-
+
-
+
+
-
-
+
+
-
+
@@ -48,6 +51,7 @@
+
@@ -56,51 +60,64 @@
-
-
+
+
+
-
-
+
+
-
+
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
+
@@ -127,6 +144,8 @@
+
+
@@ -169,6 +188,7 @@
+
@@ -179,11 +199,13 @@
+
+
@@ -196,34 +218,38 @@
-
-
-
-
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
@@ -271,7 +297,7 @@
-
+
@@ -291,12 +317,12 @@
-
+
-
+
diff --git a/ui/index.html b/ui/index.html
index a426dcdf4..44edb399f 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -38,7 +38,7 @@ if (ieVersion !== false) {
}
/* MacGap hacks */
-if (macgap) {
+if (typeof macgap !== 'undefined') {
if (macgap.menu) {
var tmp = macgap.menu.getItem("Help");
if (tmp)