diff --git a/debian/changelog b/debian/changelog
index 8f5badd..d46bfa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ gfxboot-theme-ubuntu (0.4.1) UNRELEASED; urgency=low
 
   * Remove unused logo fading code.
   * Update langlist from langnames.inc.
+  * Override language names for Gujarati, Khmer, Malayalam, and Tamil to use
+    the English names; I don't seem to be able to generate a font containing
+    the necessary characters for their localised names at the moment.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Mon, 06 Aug 2007 20:46:18 +0100
 
diff --git a/langnames.inc b/langnames.inc
index f634a07..cae12bc 100644
--- a/langnames.inc
+++ b/langnames.inc
@@ -18,7 +18,7 @@
   [ "fi" "fi_FI" "Suomi" ]
   [ "fr" "fr_FR" "Français" ]
   [ "gl" "gl_ES" "Galego" ]
-  [ "gu" "gu_IN" "ગુજરાતી" ]
+  [ "gu" "gu_IN" "Gujarati" ]
   [ "he" "he_IL" "עברית" ]
   [ "hi" "hi_IN" "हिन्दी" ]
   [ "hr" "hr_HR" "Hrvatski" ]
@@ -27,13 +27,13 @@
   [ "it" "it_IT" "Italiano" ]
   [ "ja" "ja_JP" "日本語" ]
   [ "ka" "ka_GE" "ქართული" ]
-  [ "km" "km_KH" "ខ្មែរ" ]
+  [ "km" "km_KH" "Khmer" ]
   [ "ko" "ko_KR" "한국어" ]
   [ "ku" "ku_TR" "Kurdî" ]
   [ "lt" "lt_LT" "Lietuviškai" ]
   [ "lv" "lv_LV" "Latviski" ]
   [ "mk" "mk_MK" "Македонски" ]
-  [ "ml" "ml_IN" "മലയാളഠ" ]
+  [ "ml" "ml_IN" "Malayalam" ]
   [ "nb" "nb_NO" "Norsk bokmål" ]
   [ "ne" "ne_NP" "नेपाली" ]
   [ "nl" "nl_NL" "Nederlands" ]
@@ -49,7 +49,7 @@
   [ "sl" "sl_SI" "Slovenščina" ]
   [ "sq" "sq_AL" "Shqip" ]
   [ "sv" "sv_SE" "Svenska" ]
-  [ "ta" "ta_IN" "தமிழ்" ]
+  [ "ta" "ta_IN" "Tamil" ]
   [ "th" "th_TH" "ภาษาไทย" ]
   [ "tl" "tl_PH" "Tagalog" ]
   [ "tr" "tr_TR" "Türkçe" ]
diff --git a/scrape-localechooser b/scrape-localechooser
index c7978d3..f1b28b2 100755
--- a/scrape-localechooser
+++ b/scrape-localechooser
@@ -19,7 +19,11 @@ my %langcode_override = (
 # The real localised names for these languages use characters not present in
 # our font.
 my %langname_override = (
+    'Gujarati' => 'Gujarati',
+    'Khmer' => 'Khmer',
     'Punjabi (Gurmukhi)' => 'Punjabi (Gurmukhi)',
+    'Malayalam' => 'Malayalam',
+    'Tamil' => 'Tamil',
 );
 
 my %langcodes;