diff --git a/Changelog.yaml b/Changelog.yaml
index bf59096c03..66daf8ec4f 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,41 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.6.31
+  date: 2009-12-27
+
+  new features:
+    - title: "Support for the SONY PRS 900 and the Airis dBook"
+      type: major
+
+    - title: "Device detection on OS X now directly queries the IOKit registry instead of parsing the output of the ioreg command."
+      description: >
+        "The logic for device detection in OS X is very similar to that in linux. This means that if a windows driver
+        for a device is written, it should work with no modification on both OS X and Linux."
+
+  bug fixes:
+    - title: "Fix a major regression in the 0.6.30 news download system that caused a lot of recipes to fail"
+
+    - title: "Make PRS 500 driver thread safe."
+      tickets: [4307]
+
+    - title: "Fix ebook viewer not working when launched as standalone program to view PDF files on windows"
+
+    - title: "PDB Output: Fix italics"
+
+
+  new recipes:
+
+    - title: The Hartford Courant
+      author: Being
+
+    - title: National Post
+      author: Nick Redding
+
+    - title: The Columbus Dispatch
+      author: kwetal
+
+
 - version: 0.6.30
   date: 2009-12-26
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 6dad114a6f..f75147fee6 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.30'
+__version__   = '0.6.31'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index e239699a4e..e3ae1ee99e 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -134,7 +134,10 @@ class Device(DeviceConfig, DevicePlugin):
     def reset(self, key='-1', log_packets=False, report_progress=None,
             detected_device=None):
         self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
-        self.detected_device = USBDevice(detected_device)
+        try:
+            self.detected_device = USBDevice(detected_device)
+        except: # On windows detected_device is None
+            self.detected_device = None
 
     @classmethod
     def get_gui_name(cls):