diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
index 2d7d6cad..65f26966 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -20,6 +20,11 @@ jobs:
       with:
         mdbook-version: latest
 
+    - name: Install i18n-helpers
+      working-directory: gb-asm-tutorial/
+      run: cargo install --path i18n-helpers --locked
+      shell: bash
+
     # FIXME: Keep this up to date
     - name: Install mdbook-linkcheck
       run: | # `-L` because GitHub performs a redirection
@@ -43,6 +48,11 @@ jobs:
         MDBOOK_OUTPUT__LINKCHECK__OPTIONAL: "false"
       run: |
         mdbook build
+        for f in po/*.po; do
+            lang="${f%.po}"
+            MDBOOK_BOOK__LANGUAGE="$lang" mdbook build -d book/"$lang"
+            mv book/"$lang"/custom book/custom/"$lang"
+        done
 
     - name: Store final build
       uses: actions/upload-artifact@v2
diff --git a/.gitignore b/.gitignore
index 2587e998..7265a402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /book/
 /target/
 .DS_Store
-po/messages.pot
+/po/messages.pot
diff --git a/README.md b/README.md
index 34fc0eb7..e43e960a 100644
--- a/README.md
+++ b/README.md
@@ -62,5 +62,5 @@ Different parts of gb-asm-tutorial are subject to different licenses:
 - All the code contained within the tutorial itself is licensed under <a rel="license" href="http://creativecommons.org/publicdomain/zero/1.0/">CC0</a>. *To the extent possible under law, all copyright and related or neighboring rights to code presented within GB ASM Tutorial have been waived. This work is published from France.*
 - The contents (prose, images, etc.) of this tutorial are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International License</a>.
 - Code used to display and format the site is licensed under the [MIT License](https://github.com/gbdev/gb-asm-tutorial/blob/master/LICENSE) unless otherwise specified.
-- The code related to the i18n support is originally from Google's [Comprehensive Rust](https://github.com/google/comprehensive-rust) and it's released under the [Apache License 2.0](https://github.com/gbdev/gb-asm-tutorial/blob/master/i18n-helpers/LICENSE).
+- The code related to the i18n support is originally from Google's [Comprehensive Rust](https://github.com/google/comprehensive-rust) and is released under the [Apache License 2.0](https://github.com/gbdev/gb-asm-tutorial/blob/master/i18n-helpers/LICENSE).