diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47a76ae10d0..997fe506661 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,7 @@
 	* international/mule-cmds.el (set-locale-environment): Make sure
 	the coding-system preferred by the locale's language has the same
 	EOL conversion type as the original buffer-file-coding-system.
+	(locale-language-names): Add a few MS Windows language codes.
 
 2006-04-07  Richard Stallman  <rms@gnu.org>
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7aebc4928ab..17004f6bcd5 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2135,6 +2135,7 @@ of `buffer-file-coding-system' set by this function."
     ("cy" "Welsh" iso-8859-14)
     ("da" . "Latin-1") ; Danish
     ("de" "German" iso-8859-1)
+    ; dv Divehi
     ; dz Bhutani
     ("el" "Greek" iso-8859-7)
     ;; Users who specify "en" explicitly typically want Latin-1, not ASCII.
@@ -2296,6 +2297,10 @@ of `buffer-file-coding-system' set by this function."
     ("jp" . "Japanese") ; e.g. MS Windows
     ("chs" . "Chinese-GB") ; MS Windows Chinese Simplified
     ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional
+    ("gbz" . "UTF-8") ; MS Windows Dari Persian
+    ("div" . "UTF-8") ; MS Windows Divehi (Maldives)
+    ("wee" . "Latin-2") ; MS Windows Lower Sorbian
+    ("wen" . "Latin-2") ; MS Windows Upper Sorbian
     ))
   "Alist of locale regexps vs the corresponding languages and coding systems.
 Each element has these form: