diff --git a/Changelog.yaml b/Changelog.yaml
index 0d322d2d42..3b5dcd8d10 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,8 +4,62 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.6.40
+  date: 2010-02-12
+
+  new features:
+    - title: "Ability to perform exact match and regular expression based searches."
+      type: major
+      tickets: [4830]
+      description: >
+        "You can now perform exact match searches by prefixing your search term with an =.
+        So for example, tag:=fiction will match all tags named fiction, but not tags named
+        non-fiction. Similarly, you can use regular expression based searches by prefixing
+        the search term by ~."
+
+    - title: "Autodetect if a zip/rar file is actually a comic and if so, import it as CBZ/CBR"
+      tickets: [4753]
+
+    - title: "Add plugin to automatically extract an ebook during import if it is in a zip/rar archive"
+
+    - title: "Linux source install: Install a calibre environment module to ease the integration of calibre into other python projects"
+
+  bug fixes:
+    - title: "Fix regression in 0.6.39 that broke the LRF viewer"
+
+    - title: "ZIP/EPUB files: Try to detect file name encoding instead of assuming the name is encoded in UTF-8. Also correctly
+              encode the extracted file name in the local filesystem encoding."
+
+    - title: "HTML Input: Handle HTML fragments more gracefully"
+      tickets: [4854]
+
+    - title: "Zip files: Workaround invalid zip files that contain end-of-file comments but set comment size to zero"
+
+    - title: "Restore the recipe for the Wired daily feed."
+      tickets: [4871]
+
+    - title: "MOBI metadata: Preserve original EXTH records when not overwrriten by calibre metadata."
+
+    - title: "Catalog generation: Improved series sorting. All books not in a series are now grouped together"
+
+    - title: "Fix occassional threading related crash when using the ChooseFormatDialog"
+
+    - title: "Catalog generation: Various fixes for handling invalid data"
+
+  new recipes:
+    - title: Sueddeustche Zeitung 
+      author: Darko Miletic
+
+  improved recipes:
+    - Pagina 12
+    - Variety
+    - Toronto Sun
+    - Telegraph UK
+    - Danas
+    - Dilbert
+
 - version: 0.6.39
-  date: 2010-02-11
+  date: 2010-02-09
 
   new features:
     - title: "Add ability to control how author sort strings are automatically generated from author strings, via the config file tweaks.py"
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 4b583c6608..ff8a575e26 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.39'
+__version__   = '0.6.40'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
index f9e78e5dfa..fdf0ceee98 100644
--- a/src/calibre/ebooks/metadata/archive.py
+++ b/src/calibre/ebooks/metadata/archive.py
@@ -51,7 +51,7 @@ class ArchiveExtract(FileTypePlugin):
         fname = fnames[0]
         ext = os.path.splitext(fname)[1][1:]
         if ext.lower() not in ('lit', 'epub', 'mobi', 'prc', 'rtf', 'pdf',
-                'mp3'):
+                'mp3', 'pdb', 'azw', 'azw1'):
             return archive
 
         of = self.temporary_file('_archive_extract.'+ext)