diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index d4adc959333..ff1a529a2ee 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -43,6 +43,8 @@
     <Property Id="SKIPNETWORKING" Secure="yes"/>
     <!-- Whether to keep default (unauthenticated) user. Default is no-->
     <Property Id="DEFAULTUSER" Secure="yes"/>
+    <!-- Set server character set to UTF8 -->
+    <Property Id="UTF8" Secure="yes"/>
     <!-- Whether to data on uninstall (default yes, after asking user consent) -->
     <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
     <!-- Force per machine installation -->
@@ -272,6 +274,10 @@
           <Text>Please note: this setting can lead to insecure systems.</Text>
         </Control>
 
+        <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="215" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no">
+          <Text>{\Font1}Use UTF8 as default server's character set</Text>
+        </Control>
+
         <!-- Navigation buttons-->
         <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&amp;Back">
           <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
@@ -519,6 +525,20 @@
             Value="ON" />
       </Component>
 
+      <Component Id="C.utf8" Guid="*" Directory="DATADIR">
+        <Condition>UTF8</Condition>
+        <RegistryValue Root='HKLM'
+           Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
+           Name='UTF8' Value='1' Type='string' KeyPath='yes'/>
+        <IniFile Id="Ini6"
+            Action="createLine"
+            Directory="DATADIR"
+            Section="mysqld"
+            Name="my.ini"
+            Key="character-set-server"
+            Value="utf8" />
+      </Component>
+
       <!--- Grant service account permission to the database folder (Windows 7 and later) -->
       <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'>
         <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition>