diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index ac699d427..dc57f34bd 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -1,10 +1,14 @@
-# Which kiwix-tools to download from http://download.iiab.io/packages/ (origin: http://download.kiwix.org/nightly/)
+# Which kiwix-tools to download from http://download.iiab.io/packages/
+# As obtained from http://download.kiwix.org/release/kiwix-tools/ or http://download.kiwix.org/nightly/
 
-kiwix_version_armhf: "kiwix-tools_armhf-0.4.0"
-kiwix_version_linux64: "kiwix-tools_linux64-0.4.0"
-kiwix_version_i686: "kiwix-0.10-linux-i686"            # Published Oct 2016 ("experimental")
-# kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"      # Published May 2014 ("use v0.9 to test legacy ZIM content")
-# KIWIX FOR i686 SHOULD BE REPLACED IN EARLY 2018: https://github.com/kiwix/kiwix-build/issues/94
+kiwix_version_armhf: "kiwix-tools_linux-armhf-0.5.0"
+kiwix_version_linux64: "kiwix-tools_linux-x86_64-0.5.0"
+kiwix_version_i686: "kiwix-tools_linux-i586-0.5.0"
+# kiwix_src_file_i686: "kiwix-linux-i686.tar.bz2"
+# v0.9 for i686 published May 2014 ("use it to test legacy ZIM content")
+# v0.10 for i686 published Oct 2016 ("experimental") REPLACED IN EARLY 2018, thx to Matthieu Gautier:
+# https://github.com/kiwix/kiwix-build/issues/94
+# https://github.com/kiwix/kiwix-tools/issues/170
 
 kiwix_src_file_armhf: "{{ kiwix_version_armhf }}.tar.gz"
 kiwix_src_file_linux64: "{{ kiwix_version_linux64 }}.tar.gz"