diff --git a/Changelog.yaml b/Changelog.yaml
index 544d6a72f8..017e0b0528 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -19,6 +19,67 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.8.5
+  date: 2011-06-10
+
+  new features:
+    - title: "A new 'portable' calibre build, useful if you like to carry around calibre and its library on a USB key"
+      type: major
+      description: "For details, see: http://calibre-ebook.com/download_portable"
+
+    - title: "E-book viewer: Remember the last used font size multiplier."
+      tickets: [774343]
+
+    - title: "Preliminary support for the Kobo Touch. Drivers for the ZTE v9 tablet, Samsung S2, Notion Ink Adam and PocketBook 360+"
+
+    - title: "When downloading metadata merge rather than replace tags"
+
+    - title: "Edit metadata dialog: When pasting in an ISBN, if not valid ISBN if present on the clipboard popup a box for the user to enter the ISBN"
+
+    - title: "Windows build: Add code to load .pyd python extensions from a zip file. This allows many more files in the calibre installation to be zipped up, speeding up the installer."
+    - title: "Add an action to remove all formats from the selected books to the remove books button"
+
+  
+  bug fixes:
+    - title: "Various minor bug fixes to the column coloring code"
+
+    - title: "Fix the not() template function"
+
+    - title: "Nook Color/TSR: When sending books to the storage card place them in the My Files/Books subdirectory. Also do not upload cover thumbnails as users report that the NC/TSR don't use them."
+      tickets: [792842]
+
+    - title: "Get Books: Update plugins for Amazon and B&N stores to handle website changes. Enable some stores by default on first run. Add Zixo store"
+      tickets: [792762]
+
+    - title: "Comic Input: Replace the # character in filenames as it can cause problem with conversion/vieweing."
+      tickets: [792723]
+
+    - title: "When writing files to zipfile, reset timestamp if it doesn't fit in 1980's vintage storage structures"
+
+    - title: "Amazon metadata plugin: Fix parsing of published date from amazon.de when it has februar in it"
+
+  improved recipes:
+    - Ambito
+    - GoComics
+    - Le Monde Diplomatique
+    - Max Planck
+    - express.de
+
+  new recipes:
+    - title: Ambito Financiero
+      author: Darko Miletic
+
+    - title: Stiin Tas Technica
+      author: Silviu Cotoara
+
+    - title: "Metro News NL"
+      author: DrMerry
+
+    - title: "Brigitte.de, Polizeipresse DE and Heise Online"
+      author: schuster
+
+
+
 - version: 0.8.4
   date: 2011-06-03
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 2c5a151a27..f6b0a8d802 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 8, 4)
+numeric_version = (0, 8, 5)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 
diff --git a/src/calibre/translations/de.po b/src/calibre/translations/de.po
index 45daf266c1..ceea127f8a 100644
--- a/src/calibre/translations/de.po
+++ b/src/calibre/translations/de.po
@@ -11995,7 +11995,7 @@ msgstr "ungültiger zustand"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:336
 msgid "One of the conditions for this rule is invalid: <b>%s</b>"
-msgstr "Eine bedingung für diese Regel ist ungültig"
+msgstr "Eine bedingung für diese Regel ist ungültig: <b>%s</b>"
 
 #: /home/kovid/work/calibre/src/calibre/gui2/preferences/coloring.py:341
 msgid "No conditions"
diff --git a/src/calibre/translations/ja.po b/src/calibre/translations/ja.po
index e61ac99fff..b19b25ca17 100644
--- a/src/calibre/translations/ja.po
+++ b/src/calibre/translations/ja.po
@@ -6178,11 +6178,11 @@ msgid ""
 "size-rescaling\">User Manual</a> for a discussion of how font size rescaling "
 "works.</p>"
 msgstr ""
-"<p>このウイザードは最適なフォントサイズのキーを選択する事を手伝います。入力ドキュメントのベースフォントサイズとフォントサイズを入力すると、ウイザードは"
-"\n"
-"フォント変換アルゴリズムを使って、どのフォントサイズになるのかを表示します。下の出力ベースフォントサイズとフォント･キーを調整することで、アルゴリズムを調"
-"\n"
-"整することができます。適当な値が決まったらOKをクリックしてください。</p>\\n\n"
+"<p>このウイザードは最適なフォントサイズのキーを選択する事を手伝います。入力ドキュメントのベースフォントサイズとフォントサイズを入力すると、ウイザード"
+"は\n"
+"フォント変換アルゴリズムを使って、どのフォントサイズになるのかを表示します。下の出力ベースフォントサイズとフォント･キーを調整することで、アルゴリズムを"
+"調\n"
+"整することができます。適当な値が決まったらOKをクリックしてください。</p>\n"
 "<p>ディフォールトでは出力ベースフォントサイズは０でフォントサイズ･キーは指定されていないので、calibreは出力プロファイルの値を使用します。 \n"
 "</p>\n"
 "<p>詳しくは<a href=\"http://manual.calibre-ebook.com/conversion.html#font-size-"