diff --git a/openid/yadis/parsehtml.py b/openid/yadis/parsehtml.py
index 875a089c..36107971 100644
--- a/openid/yadis/parsehtml.py
+++ b/openid/yadis/parsehtml.py
@@ -155,6 +155,10 @@ def feed(self, chars):
 
         return HTMLParser.feed(self, chars)
 
+    def unescape(self, value):
+        # HTMLParser in >=Python-2.6 chokes here on UTF-8 input
+        return value
+
 def findHTMLMeta(stream):
     """Look for a meta http-equiv tag with the YADIS header name.