diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7878276..0403876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,8 @@
 * Started a small checklist on how to contribute (#37).
 * Italian translation of *The Black Hack* and *Additional Things* by Fabio Gemesio (#35).
 * Little cleanup in `meta.yml` - french and italian (#38).
-* Updated Japanese translation, fixing typos and errors.
+* Updated Japanese translation, fixing typos and errors (#36).
+* Fixed word-wrap issue with Japanese bestiary table (#39).
 
 ## 2.1.0 (2016-08-13)
 
diff --git a/templates/base.html b/templates/base.html
index f52d7ac..02414cf 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -99,6 +99,10 @@
 table tr:nth-child(2n) {
   background-color: #f8f8f8;
 }
+/* Specific japanese style, for the bestiary */
+#mi-yi-zhou-wen ~ table {
+    word-break: normal;
+}
 th em {
     font-family: Alegreya, serif;
 }