diff --git a/Changelog.yaml b/Changelog.yaml
index f5835a0b1a..c2124aadd9 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,70 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.6.36
+  date: 2010-01-25
+
+  new features:
+    - title: Catalog generation in MOBI format
+
+    - title: "Driver for Inves Book 600"
+
+    - title: "Show notifications on OS X even when systray icon is disabled. "
+
+  bug fixes:
+    - title: Fix memory leak in catalog generation
+
+    - title: Fix regression that broke PML output
+
+    - title: Fix bug in MOBI Input
+      tickets: [4643]
+
+    - title: "Replace commas with semi-colons in download tags"
+      tickets: [4650]
+
+    - title: Fix catalog output format dropdown empty in linux
+      tickets: [4656]
+
+    - title: "Fix display of non-English characters in OS X notifications"
+      tickets: [4654]
+
+    - title: Add .cbc to list of book formats
+      tickets: [4662]
+
+    - title: "Content server: Mobile page breaks if library contains empty books. Now fixed."
+
+    - title: "Support old 212 byte header PDB files"
+      tickets: [4646]
+
+    - title: "Fix regression that caused wrong error message to be displayed when device is out of space"
+
+
+  new recipes:
+    - title: Harvard Business Review Blogs
+      author: Brian_G
+
+    - title: Neowin
+      author: Darko Miletic
+
+    - title: Greensboro News and Record
+      author: Walt Anthony
+
+    - title: Hot Air
+      author: Walt Anthony
+
+    - title: ionline
+      author: Darko Miletic
+
+    - title: The National Review Online
+      author: Walt Anthony
+
+  improved recipes:
+    - Ars Technica
+    - Sports Illustrated
+    - Common Dreams
+    - Wired Magazine
+
+
 - version: 0.6.35
   date: 2010-01-22
 
diff --git a/resources/recipes/nytimes_sub.recipe b/resources/recipes/nytimes_sub.recipe
index ebc97b561c..e07560c554 100644
--- a/resources/recipes/nytimes_sub.recipe
+++ b/resources/recipes/nytimes_sub.recipe
@@ -55,9 +55,7 @@ class NYTimes(BasicNewsRecipe):
         return 'NY Times'
 
     def parse_index(self):
-        self.encoding = 'cp1252'
         soup = self.index_to_soup('http://www.nytimes.com/pages/todayspaper/index.html')
-        self.encoding = None
 
         def feed_title(div):
             return ''.join(div.findAll(text=True, recursive=False)).strip()
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 84676c8acc..67278efb25 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.35'
+__version__   = '0.6.36'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/web/feeds/news.py b/src/calibre/web/feeds/news.py
index 61de20c2d6..9abb55852e 100644
--- a/src/calibre/web/feeds/news.py
+++ b/src/calibre/web/feeds/news.py
@@ -423,7 +423,10 @@ class BasicNewsRecipe(Recipe):
         if raw:
             return _raw
         if not isinstance(_raw, unicode) and self.encoding:
-            _raw = _raw.decode(self.encoding, 'replace')
+            if callable(self.encoding):
+                _raw = self.encoding(_raw)
+            else:
+                _raw = _raw.decode(self.encoding, 'replace')
         massage = list(BeautifulSoup.MARKUP_MASSAGE)
         massage.append((re.compile(r'&(\S+?);'), lambda match: entity_to_unicode(match, encoding=self.encoding)))
         return BeautifulSoup(_raw, markupMassage=massage)