diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ba548fb..110e9fbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@ updated languages:
 
 new languages:
 
+*  gn (Guarani) -- ChrisLeo
 *  mb-br2 (Brazillian Portuguese)
 *  mb-de\* (German) : extend support coverage of the German MBROLA voices
 *  mb-lt1 (Lithuanian) -- embar
diff --git a/Makefile.am b/Makefile.am
index 04b39ef4..4ba03475 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -505,6 +505,12 @@ dictsource/gd_extra:
 espeak-data/gd_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gd_list dictsource/gd_rules dictsource/gd_extra
 	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gd && cd ..
 
+gn: espeak-data/gn_dict
+dictsource/gn_extra:
+	touch dictsource/gn_extra
+espeak-data/gn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gn_list dictsource/gn_rules dictsource/gn_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gn && cd ..
+
 grc: espeak-data/grc_dict
 dictsource/grc_extra:
 	touch dictsource/grc_extra
diff --git a/src/windows/data.vcxproj b/src/windows/data.vcxproj
index 5dc0d594..69bef8bb 100644
--- a/src/windows/data.vcxproj
+++ b/src/windows/data.vcxproj
@@ -148,6 +148,9 @@
   <Target Name="gd" Inputs="$(ProjectDir)..\..\dictsource\gd_rules;$(ProjectDir)..\..\dictsource\gd_list" Outputs="$(ProjectDir)..\..\espeak-data\gd_dict" DependsOnTargets="Phonemes">
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gd"/>
   </Target>
+  <Target Name="gn" Inputs="$(ProjectDir)..\..\dictsource\gn_rules;$(ProjectDir)..\..\dictsource\gn_list" Outputs="$(ProjectDir)..\..\espeak-data\gn_dict" DependsOnTargets="Phonemes">
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=gn"/>
+  </Target>
   <Target Name="grc" Inputs="$(ProjectDir)..\..\dictsource\grc_rules;$(ProjectDir)..\..\dictsource\grc_list" Outputs="$(ProjectDir)..\..\espeak-data\grc_dict" DependsOnTargets="Phonemes">
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=grc"/>
   </Target>
@@ -308,5 +311,5 @@
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=zhy"/>
   </Target>
   <!-- NOTE: Compiling 'my' triggers an assertion, so is disabled for now. -->
-  <Target Name="Dictionaries" DependsOnTargets="af;am;an;as;az;bg;bn;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;ka;kl;kn;ko;ku;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy"/>
+  <Target Name="Dictionaries" DependsOnTargets="af;am;an;as;az;bg;bn;ca;cs;cy;da;de;el;en;eo;es;et;eu;fa;fi;fr;ga;gd;gn;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;ka;kl;kn;ko;ku;la;lfn;lt;lv;mk;ml;mr;ms;mt;my;nci;ne;nl;no;om;or;pa;pap;pl;pt;ro;ru;si;sk;sl;sq;sv;sw;ta;te;tn;tr;tt;ur;vi;zh;zhy"/>
 </Project>
diff --git a/src/windows/installer/Product.wxs b/src/windows/installer/Product.wxs
index e68af7be..01e1a2ae 100644
--- a/src/windows/installer/Product.wxs
+++ b/src/windows/installer/Product.wxs
@@ -146,6 +146,9 @@
       <Feature Id="lang_kl" Title="Greenlandic" Level="1">
         <ComponentGroupRef Id="LangGreenlandic"/>
       </Feature>
+      <Feature Id="lang_gn" Title="Guarani" Level="1">
+        <ComponentGroupRef Id="LangGuarani"/>
+      </Feature>
       <Feature Id="lang_gu" Title="Gujarati" Level="1">
         <ComponentGroupRef Id="LangGujarati"/>
       </Feature>
@@ -416,6 +419,9 @@
             <Component Id="gd_dict" Win64="$(var.Win64)" Guid="B2D1B94F-796A-41AB-A908-C55D385ABB0A">
               <File Name="gd_dict" Source="$(var.ProjectDir)..\..\..\espeak-data\gd_dict" KeyPath="yes"/>
             </Component>
+            <Component Id="gn_dict" Win64="$(var.Win64)" Guid="5E0A35C9-D7F1-4511-8054-25BC405E85EC">
+              <File Name="gn_dict" Source="$(var.ProjectDir)..\..\..\espeak-data\gn_dict" KeyPath="yes"/>
+            </Component>
             <Component Id="grc_dict" Win64="$(var.Win64)" Guid="341E54AE-9EB1-4F2A-8FEE-B2E19F825041">
               <File Name="grc_dict" Source="$(var.ProjectDir)..\..\..\espeak-data\grc_dict" KeyPath="yes"/>
             </Component>
@@ -821,6 +827,11 @@
                   <File Name="ro" Source="$(var.ProjectDir)..\..\..\espeak-data\voices\roa\ro" KeyPath="yes"/>
                 </Component>
               </Directory>
+              <Directory Id="SAI" Name="sai">
+                <Component Id="gn" Win64="$(var.Win64)" Guid="D11B73FF-7A67-49B0-8BE6-1345BA1EB00D">
+                  <File Name="gn" Source="$(var.ProjectDir)..\..\..\espeak-data\voices\sai\gn" KeyPath="yes"/>
+                </Component>
+              </Directory>
               <Directory Id="SEM" Name="sem">
                 <Component Id="am" Win64="$(var.Win64)" Guid="B28850DE-493A-464F-8889-8AA746F31596">
                   <File Name="am" Source="$(var.ProjectDir)..\..\..\espeak-data\voices\sem\am" KeyPath="yes"/>
@@ -1099,6 +1110,10 @@
       <ComponentRef Id="kl"/>
       <ComponentRef Id="kl_dict"/>
     </ComponentGroup>
+    <ComponentGroup Id="LangGuarani">
+      <ComponentRef Id="gn"/>
+      <ComponentRef Id="gn_dict"/>
+    </ComponentGroup>
     <ComponentGroup Id="LangGujarati">
       <ComponentRef Id="gu"/>
       <ComponentRef Id="gu_dict"/>