diff --git a/roles/1-prep/templates/92-rtc-i2c.rules b/roles/1-prep/templates/92-rtc-i2c.rules
index 34b1d093f..f40feb273 100644
--- a/roles/1-prep/templates/92-rtc-i2c.rules
+++ b/roles/1-prep/templates/92-rtc-i2c.rules
@@ -1,3 +1,3 @@
 # /etc/udev/rules.d/92-rtc-i2c.rules
 #
-ACTION=="add", SUBSYSTEM=="rtc", ATTRS{hctosys}=="0", RUN+="/usr/sbin/hwclock -s --utc"
+ACTION=="add", SUBSYSTEM=="rtc", ATTRS{hctosys}=="0", RUN+="/sbin/hwclock -s --utc"
diff --git a/roles/awstats/templates/apache.conf b/roles/awstats/templates/apache.conf
index 113f04655..a47a58fab 100644
--- a/roles/awstats/templates/apache.conf
+++ b/roles/awstats/templates/apache.conf
@@ -32,6 +32,7 @@ ScriptAlias /awstats /usr/lib/cgi-bin
 # This provides worldwide access to everything in the directory
 # Security concerns: none known
 Alias /awstats-icon/ /usr/share/awstats/icon/
+Alias /awstatsicons/ /usr/share/awstats/icon/
 
 # This provides worldwide access to everything in the directory
 # Security concerns: none known
diff --git a/roles/httpd/files/html/assets/lang_codes.json b/roles/httpd/files/html/assets/lang_codes.json
index 33058844d..2dc6c64f5 100755
--- a/roles/httpd/files/html/assets/lang_codes.json
+++ b/roles/httpd/files/html/assets/lang_codes.json
@@ -23,7 +23,8 @@
 "bel":{"iso2":"be","engname":"Belarusian","locname":"Беларуская"},
 "ben":{"iso2":"bn","engname":"Bengali","locname":"বাংলা"},
 "be-x-old":{"iso2":"be-x-old","engname":"Belarusian (Taraškievica)","locname":"Беларуская (тарашкевіца)"},
-"bho":{"iso2":"bh","engname":"Bihari","locname":"भोजपुरी"},
+"bgd":{"iso2":"bgd","engname":"Pawri","locname":"Pawri"},
+"bho":{"iso2":"bh","engname":"Bhojpuri","locname":"भोजपुरी"},
 "bis":{"iso2":"bi","engname":"Bislama","locname":"Bislama"},
 "bjn":{"iso2":"bjn","engname":"Banjar","locname":"Bahasa Banjar"},
 "bod":{"iso2":"bo","engname":"Tibetan","locname":"བོད་སྐད"},
@@ -90,8 +91,10 @@
 "glk":{"iso2":"glk","engname":"Gilaki","locname":"گیلکی"},
 "glv":{"iso2":"gv","engname":"Manx","locname":"Gaelg"},
 "gom":{"iso2":"gom","engname":"Goan Konkani","locname":"गोंयची कोंकणी "},
+"gon":{"iso2":"gon","engname":"Gondi","locname":"Gondi"},
 "got":{"iso2":"got","engname":"Gothic","locname":"𐌲𐌿𐍄𐌹𐍃𐌺"},
 "grn":{"iso2":"gn","engname":"Guarani","locname":"Avañe'ẽ"},
+"grt":{"iso2":"grt","engname":"Garo","locname":"আ·চিক"},
 "gsw":{"iso2":"de","engname":"German","locname":"Deutsch"},
 "guj":{"iso2":"gu","engname":"Gujarati","locname":"ગુજરાતી"},
 "hak":{"iso2":"hak","engname":"Hakka","locname":"Hak-kâ-fa / 客家話"},
@@ -130,11 +133,15 @@
 "kau":{"iso2":"kr","engname":"Kanuri","locname":"Kanuri"},
 "kaz":{"iso2":"kk","engname":"Kazakh","locname":"Қазақша"},
 "kbd":{"iso2":"kbd","engname":"Kabardian Circassian","locname":"Адыгэбзэ (Adighabze)"},
+"kfq":{"iso2":"kfq","engname":"Korku","locname":"Korku"},
+"kha":{"iso2":"kha","engname":"Khasi","locname":"খাশি"},
 "khm":{"iso2":"km","engname":"Khmer","locname":"ភាសាខ្មែរ"},
 "kik":{"iso2":"ki","engname":"Kikuyu","locname":"Gĩkũyũ"},
 "kin":{"iso2":"rw","engname":"Kinyarwanda","locname":"Ikinyarwanda"},
 "kir":{"iso2":"ky","engname":"Kirghiz","locname":"Кыргызча"},
 "koi":{"iso2":"koi","engname":"Komi-Permyak","locname":"Перем Коми (Perem Komi)"},
+"kok":{"iso2":"kok","engname":"Konkani","locname":"ಕೊಂಕಣಿ"},
+"kokana":{"iso2":"kokana","engname":"Kokana","locname":"Kokana"},
 "kom":{"iso2":"kv","engname":"Komi","locname":"Коми"},
 "kon":{"iso2":"kg","engname":"Kongo","locname":"KiKongo"},
 "kor":{"iso2":"ko","engname":"Korean","locname":"한국어"},
@@ -156,6 +163,7 @@
 "ltg":{"iso2":"ltg","engname":"Latgalian","locname":"Latgaļu"},
 "ltz":{"iso2":"lb","engname":"Luxembourgish","locname":"Lëtzebuergesch"},
 "lug":{"iso2":"lg","engname":"Luganda","locname":"Luganda"},
+"lus":{"iso2":"lus","engname":"Mizo","locname":"Mizo"},
 "mah":{"iso2":"mh","engname":"Marshallese","locname":"Ebon"},
 "mai":{"iso2":"mai","engname":"Maithili","locname":"मैथिली"},
 "mal":{"iso2":"ml","engname":"Malayalam","locname":"മലയാളം"},
@@ -167,6 +175,7 @@
 "mkd":{"iso2":"mk","engname":"Macedonian","locname":"Македонски"},
 "mlg":{"iso2":"mg","engname":"Malagasy","locname":"Malagasy"},
 "mlt":{"iso2":"mt","engname":"Maltese","locname":"Malti"},
+"mni":{"iso2":"mni","engname":"Manipuri","locname":"মৈতৈলোন্"},
 "mo":{"iso2":"mo","engname":"Moldovan","locname":"Молдовеняскэ"},
 "mon":{"iso2":"mn","engname":"Mongolian","locname":"Монгол"},
 "mri":{"iso2":"mi","engname":"Maori","locname":"Māori"},
diff --git a/roles/kiwix/defaults/main.yml b/roles/kiwix/defaults/main.yml
index 599ddeec3..26426b5fe 100644
--- a/roles/kiwix/defaults/main.yml
+++ b/roles/kiwix/defaults/main.yml
@@ -1,6 +1,6 @@
 # Which kiwix-tools to download from http://download.iiab.io/packages/ (origin: http://download.kiwix.org/nightly/)
-kiwix_src_file_armhf: "kiwix-tools_armhf_2017-12-27.tar.gz"
-kiwix_src_file_linux64: "kiwix-tools_linux64_2017-12-27.tar.gz"
+kiwix_src_file_armhf: "kiwix-tools_armhf-2018-02-26.tar.gz"
+kiwix_src_file_linux64: "kiwix-tools_linux64-2018-02-26.tar.gz"
 kiwix_src_file_i686: "kiwix-0.10-linux-i686.tar.bz2"   # 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 BEFORE FEB 2018: https://github.com/kiwix/kiwix-build/issues/94
diff --git a/roles/kiwix/templates/kiwix-serve.service.j2 b/roles/kiwix/templates/kiwix-serve.service.j2
index d09bb062a..b4d160db4 100644
--- a/roles/kiwix/templates/kiwix-serve.service.j2
+++ b/roles/kiwix/templates/kiwix-serve.service.j2
@@ -5,6 +5,8 @@ After=syslog.target network.target local-fs.target
 [Service]
 Type=forking
 ExecStart={{ iiab_base }}/kiwix/bin/kiwix-serve --daemon --port {{ kiwix_port }} --nolibrarybutton --library {{ kiwix_library_xml }} --urlRootLocation={{ kiwix_url }}
+Restart=on-abort
+RestartSec=5s
 
 [Install]
 WantedBy=multi-user.target