diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8e1ceefa3..e79791a78 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-02  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-latex.el (org-export-latex-fix-inputenc): Never leave the
+	AUTO as a coding system, instead default to utf8.
+
 2010-02-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-block-todo-from-children-or-siblings-or-parent)
diff --git a/lisp/org-latex.el b/lisp/org-latex.el
index 8866ed760..8760ed433 100644
--- a/lisp/org-latex.el
+++ b/lisp/org-latex.el
@@ -2045,7 +2045,7 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
 (defun org-export-latex-fix-inputenc ()
   "Set the codingsystem in inputenc to what the buffer is."
   (let* ((cs buffer-file-coding-system)
-	 (opt (latexenc-coding-system-to-inputenc cs)))
+	 (opt (or (latexenc-coding-system-to-inputenc cs) "utf8")))
     (when opt
       ;; Translate if that is requested
       (setq opt (or (cdr (assoc opt org-export-latex-inputenc-alist)) opt))