diff --git a/Makefile.am b/Makefile.am
index afe94c78..dd28da77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -342,6 +342,7 @@ dictionaries: \
 	espeak-ng-data/is_dict \
 	espeak-ng-data/it_dict \
 	espeak-ng-data/jbo_dict \
+	espeak-ng-data/jp_dict \
 	espeak-ng-data/ka_dict \
 	espeak-ng-data/kl_dict \
 	espeak-ng-data/kn_dict \
@@ -596,6 +597,12 @@ dictsource/jbo_extra:
 espeak-ng-data/jbo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra
 	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=jbo && cd ..
 
+jp: espeak-ng-data/jp_dict
+dictsource/jp_extra:
+	touch dictsource/jp_extra
+espeak-ng-data/jp_dict: src/espeak-ng phsource/phonemes.stamp dictsource/jp_list dictsource/jp_rules dictsource/jp_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=jp && cd ..
+
 ka: espeak-ng-data/ka_dict
 dictsource/ka_extra:
 	touch dictsource/ka_extra
diff --git a/espeak-ng-data/voices/README.md b/espeak-ng-data/voices/README.md
index 1901649d..a47102de 100644
--- a/espeak-ng-data/voices/README.md
+++ b/espeak-ng-data/voices/README.md
@@ -61,6 +61,7 @@ The supported languages are:
 | `poz`       | `in`              | Malayo-Polynesian     | Indonesian                  |                        |
 | `art`       | `ia`              | Constructed           | Interlingua                 |                        |
 | `roa`       | `it`              | Romance               | Italian                     |                        |
+| `jpx`       | `jp`              | Japanese              | Japanese<sup>[4]</sup>      |                        |
 | `dra`       | `kn`              | Dravidian             | Kannada                     |                        |
 |             | `ko`              |                       | Korean                      |                        |
 | `ira`       | `ku`              | Iranian               | Kurdish                     |                        |
@@ -111,3 +112,5 @@ The supported languages are:
 [2] Includes support for reading American English text.
 
 [3] Farsi/Persian written using English (Latin) characters.
+
+[4] Currently, only Hiragana are supported.
diff --git a/src/windows/data.vcxproj b/src/windows/data.vcxproj
index dbf98323..bbec47ea 100644
--- a/src/windows/data.vcxproj
+++ b/src/windows/data.vcxproj
@@ -184,6 +184,9 @@
   <Target Name="jbo" Inputs="$(ProjectDir)..\..\dictsource\jbo_rules;$(ProjectDir)..\..\dictsource\jbo_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\jbo_dict" DependsOnTargets="Phonemes">
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=jbo"/>
   </Target>
+  <Target Name="jp" Inputs="$(ProjectDir)..\..\dictsource\jp_rules;$(ProjectDir)..\..\dictsource\jp_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\jp_dict" DependsOnTargets="Phonemes">
+    <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=jp"/>
+  </Target>
   <Target Name="ka" Inputs="$(ProjectDir)..\..\dictsource\ka_rules;$(ProjectDir)..\..\dictsource\ka_list" Outputs="$(ProjectDir)..\..\espeak-ng-data\ka_dict" DependsOnTargets="Phonemes">
     <Exec Command="cd $(ProjectDir)..\..\dictsource &amp;&amp; $(TargetDir)espeak-ng.exe --path=$(ProjectDir)..\.. --compile=ka"/>
   </Target>
@@ -313,6 +316,5 @@
   <Target Name="zhy" Inputs="$(ProjectDir)..\..\dictsource\zhy_rules" Outputs="$(ProjectDir)..\..\espeak-ng-data\zhy_dict" DependsOnTargets="Phonemes">
     <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;gn;grc;gu;hbs;hi;hu;hy;ia;id;is;it;jbo;ka;kl;kn;ko;ku;ky;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;jp;ka;kl;kn;ko;ku;ky;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>