2 files changed, 5 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 0d3d0446c86..12c84e53ba5 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * gnus-html.el (gnus-article-html): Tell w3m that the input is
+        UTF-8. This seems to fix problems with some German web feeds.
+
         * gnus.el (gnus-group-startup-message): Put the xpm version of the logo
         at the top so that the proper colours are applied.
 
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index cabfe345123..ba1420fb8ac 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -59,8 +59,10 @@
                                  nil article-buffer nil
                                  "-halfdump"
                                  "-no-cookie"
+                                 "-I" "UTF-8"
                                  "-O" "UTF-8"
                                  "-o" "ext_halfdump=1"
+                                 "-o" "pre_conv=1"
                                  "-t" (format "%s" tab-width)
                                  "-cols" (format "%s" gnus-html-frame-width)
                                  "-o" "display_image=off"