4 files changed, 7 insertions, 5 deletions
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake
index 34f661b393e..0722ecbbccb 100644
--- a/win/packaging/CPackWixConfig.cmake
+++ b/win/packaging/CPackWixConfig.cmake
@@ -9,7 +9,7 @@ IF(ESSENTIALS)
  ENDIF()
 ELSE()
   SET(CPACK_COMPONENTS_USED 
-    "Server;Client;Development;SharedLibraries;Embedded;Debuginfo;Documentation;IniFiles;Readme;Server_Scripts;scripts;DebugBinaries")
+    "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo")
 ENDIF()
 
 SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp
index dbce86804c8..50b39adc0b1 100644
--- a/win/packaging/ca/CustomAction.cpp
+++ b/win/packaging/ca/CustomAction.cpp
@@ -17,6 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #define UNICODE
 #endif
 
+#include <winsock2.h>
 #include <windows.h>
 #include <winreg.h>
 #include <msi.h>
@@ -26,7 +27,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 #include <string.h>
 #include <strsafe.h>
 #include <assert.h>
-
+#include <shellapi.h>
+#include <stdlib.h>
 #include <winservice.h>
 
 #define ONE_MB 1048576
diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in
index d291d06161c..d02791d3b9f 100644
--- a/win/packaging/create_msi.cmake.in
+++ b/win/packaging/create_msi.cmake.in
@@ -7,7 +7,7 @@ SET(CMAKE_CFG_INTDIR "@CMAKE_CFG_INTDIR@")
 SET(VERSION "@VERSION@")
 SET(MAJOR_VERSION "@MAJOR_VERSION@")
 SET(MINOR_VERSION "@MINOR_VERSION@")
-SET(PATCH_VERSION "@PATCH@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
 SET(CMAKE_SIZEOF_VOID_P @CMAKE_SIZEOF_VOID_P@)
 SET(MANUFACTURER "@MANUFACTURER@")
 SET(WIXCA_LOCATION "@WIXCA_LOCATION@")
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 2c01b024544..d4adc959333 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -234,7 +234,7 @@
         </Control>
 
         <Control Id="CheckBoxModifyRootPassword" Type="CheckBox" X="8" Y="62" Width="222" Height="18" Property="ModifyRootPassword" CheckBoxValue="1" TabSkip="no">
-          <Text>{\Font1}Modify root password</Text>
+          <Text>{\Font1}Modify password for database user 'root'</Text>
           <Publish Property="PASSWORD" >NOT ModifyRootPassword</Publish>
           <Publish Property="RootPasswordConfirm">NOT ModifyRootPassword</Publish>
           <Publish Property="ALLOWREMOTEROOTACCESS">NOT ModifyRootPassword</Publish>
@@ -256,7 +256,7 @@
         </Control>
         <Control Id="CheckBoxALLOWREMOTEROOTACCESS" Type="CheckBox" X="23" Y="122" Width="196" Height="18" Property="ALLOWREMOTEROOTACCESS"
                  CheckBoxValue="--allow-remote-root-access" TabSkip="no">
-          <Text>{\Font1}Enable root access from remote machines</Text>
+          <Text>{\Font1}Enable access from remote machines for 'root' user</Text>
           <Condition Action="enable">ModifyRootPassword</Condition>
           <Condition Action="disable">NOT ModifyRootPassword</Condition>
         </Control>