diff --git a/contrib/windows/Inno.Setup/ZFSInstall-debug.iss b/contrib/windows/Inno.Setup/ZFSInstall-debug.iss
index 693a4fe2c341..b0e56d560f4e 100644
--- a/contrib/windows/Inno.Setup/ZFSInstall-debug.iss
+++ b/contrib/windows/Inno.Setup/ZFSInstall-debug.iss
@@ -15,7 +15,7 @@
 #expr FileClose(VerFile)
 #undef VerFile
 ; Parse out 2.0.0-7-g689dbcfbf-dirty and delete the double-quote
-#define MyAppVersion StringChange(Copy(VerStr, 30), '"','')
+#define MyAppVersion StringChange(Copy(VerStr, 33), '"','')
 
 #pragma message MyAppVersion + " is version"
 
@@ -108,7 +108,8 @@ Source: "{#Root}\out\build\x64-Debug\cmd\os\windows\kstat\*.pdb"; DestDir: "{app
 Source: "{#SourcePath}\HowToDebug.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#Root}\contrib\windows\parsedump\*.*"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#Root}\scripts\zfs_prepare_disk"; DestDir: "{app}"; Flags: ignoreversion
-
+Source: "{#Root}\cmd\zpool\compatibility.d\*"; DestDir: "{app}\compatibility.d"; Flags: ignoreversion
+Source: "{#Root}\cmd\zpool\zpool.d\*"; DestDir: "{app}\zpool.d"; Flags: ignoreversion
 
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
diff --git a/include/sys/fs/zfs.h b/include/sys/fs/zfs.h
index 2cb28aff44ba..19eee0fc0acc 100644
--- a/include/sys/fs/zfs.h
+++ b/include/sys/fs/zfs.h
@@ -983,8 +983,14 @@ typedef struct zpool_load_policy {
 /*
  * Settings for zpool compatibility features files
  */
+#ifdef _WIN32
+/* Lets stay away from C:/windows */
+#define	ZPOOL_SYSCONF_COMPAT_D	ZFSEXECDIR "\\compatibility.d"
+#define	ZPOOL_DATA_COMPAT_D	ZFSEXECDIR "\\compatibility.d"
+#else
 #define	ZPOOL_SYSCONF_COMPAT_D	SYSCONFDIR "/zfs/compatibility.d"
 #define	ZPOOL_DATA_COMPAT_D	PKGDATADIR "/compatibility.d"
+#endif
 #define	ZPOOL_COMPAT_MAXSIZE	16384
 
 /*