diff --git a/cmake/mysql_version.cmake b/cmake/mysql_version.cmake
index cb12bf14b86..2924d6a0096 100644
--- a/cmake/mysql_version.cmake
+++ b/cmake/mysql_version.cmake
@@ -55,7 +55,9 @@ IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
    NOT "${PATCH_VERSION}" MATCHES "[0-9]+")
     MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
   ENDIF()
-
+  IF((NOT TINY_VERSION) AND (EXTRA_VERSION MATCHES "[\\-][0-9]+"))
+    STRING(REPLACE "-" "" TINY_VERSION "${EXTRA_VERSION}")
+  ENDIF()
   SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
   MESSAGE(STATUS "MariaDB ${VERSION}")
   SET(MYSQL_BASE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}" CACHE INTERNAL "MySQL Base version")
diff --git a/win/packaging/create_msi.cmake b/win/packaging/create_msi.cmake
index f992915cd22..1b6f66d0f2c 100644
--- a/win/packaging/create_msi.cmake
+++ b/win/packaging/create_msi.cmake
@@ -248,6 +248,13 @@ FUNCTION(TRAVERSE_FILES dir topdir file file_comp  dir_root)
   FILE(APPEND ${file} "<DirectoryRef Id='${DirectoryRefId}'>\n")
  
   SET(NONEXEFILES)
+  FOREACH(v MAJOR_VERSION MINOR_VERSION PATCH_VERSION TINY_VERSION)
+    IF(NOT ${v})
+      MESSAGE(FATAL_ERROR "${v} is not set")
+    ENDIF()
+  ENDFOREACH()
+  SET(default_version "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}.${TINY_VERSION}")
+
   FOREACH(f ${all_files})
     IF(NOT IS_DIRECTORY ${f})
       FILE(RELATIVE_PATH rel ${topdir} ${f})
@@ -267,6 +274,7 @@ FUNCTION(TRAVERSE_FILES dir topdir file file_comp  dir_root)
           FILE(APPEND ${file} "    <Condition>${${id}.COMPONENT_CONDITION}</Condition>\n")
         ENDIF()
         FILE(APPEND ${file} "    <File Id='F.${id}' KeyPath='yes' Source='${f_native}'")
+        FILE(APPEND ${file} " DefaultVersion='${default_version}' DefaultLanguage='1033'")
         IF(${id}.FILE_EXTRA)
           FILE(APPEND ${file} ">\n${${id}.FILE_EXTRA}</File>")
         ELSE()
@@ -396,7 +404,7 @@ ENDIF()
 
 EXECUTE_PROCESS(
  COMMAND ${LIGHT_EXECUTABLE} -v -ext WixUIExtension -ext WixUtilExtension
-  -ext WixFirewallExtension -sice:ICE61 ${SILENCE_VCREDIST_MSM_WARNINGS}
+  -ext WixFirewallExtension -sice:ICE61 -sw1103 ${SILENCE_VCREDIST_MSM_WARNINGS}
   mysql_server.wixobj  extra.wixobj -out  ${CPACK_PACKAGE_FILE_NAME}.msi
   ${EXTRA_LIGHT_ARGS}
 )