diff --git a/EAPMethods/Main.cpp b/EAPMethods/Main.cpp
index 53d73fd..1b0a104 100644
--- a/EAPMethods/Main.cpp
+++ b/EAPMethods/Main.cpp
@@ -92,8 +92,12 @@ DWORD WINAPI EapPeerGetInfo(EAP_TYPE* pEapType, EAP_PEER_METHOD_ROUTINES* pEapPe
     if (pEapType->type != EAPMETHOD_TYPE)
         return dwResult = ERROR_NOT_SUPPORTED;
 
-    pEapPeerMethodRoutines->dwVersion                    = PRODUCT_VERSION;
-    pEapPeerMethodRoutines->pEapType                     = NULL;
+    pEapPeerMethodRoutines->dwVersion =
+        ((PRODUCT_VERSION_MAJ   & 0xff) << 24) |
+        ((PRODUCT_VERSION_MIN   & 0xff) << 16) |
+        ((PRODUCT_VERSION_REV   & 0xff) <<  8) |
+         (PRODUCT_VERSION_BUILD & 0xff);
+    pEapPeerMethodRoutines->pEapType = NULL;
 
     pEapPeerMethodRoutines->EapPeerInitialize            = EapPeerInitialize;
     pEapPeerMethodRoutines->EapPeerShutdown              = EapPeerShutdown;
diff --git a/MSI/MSIBuild b/MSI/MSIBuild
index 05edc2b..2b76e6d 160000
--- a/MSI/MSIBuild
+++ b/MSI/MSIBuild
@@ -1 +1 @@
-Subproject commit 05edc2b598f7ea9683cf01c65d74aec264a02ab1
+Subproject commit 2b76e6de79b7251c4511c4b20f17100d9cecf5dd
diff --git a/include/Version.h b/include/Version.h
index 942af59..9532045 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -16,12 +16,6 @@
 
 #pragma once
 
-//
-// Product version as a single DWORD
-// Note: Used for version comparison within C/C++ code.
-//
-#define PRODUCT_VERSION          0x01030400
-
 //
 // Product version by components
 // Note: Resource Compiler has limited preprocessing capability,