2 files changed, 8 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cc88b08cb5b..d07e5becd85 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-15  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * international/mule-conf.el: Add `utf8' and `UTF8' as
+        aliases for the `utf-8' coding system.
+
 2008-10-15  Juanma Barranquero  <lekktu@gmail.com>
 
         * find-file.el (ff-get-file): Doc fix.
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index cb9cf974fea..5f470510aa4 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1274,6 +1274,9 @@ is treated as a character."
   :bom '(utf-8-with-signature . utf-8))
 
 (define-coding-system-alias 'mule-utf-8 'utf-8)
+;; common aliases
+(define-coding-system-alias 'utf8 'utf-8)
+(define-coding-system-alias 'UTF8 'utf-8)
 
 (define-coding-system 'utf-8-emacs
   "Support for all Emacs characters (including non-Unicode characters)."