diff --git a/CHANGELOG b/CHANGELOG
index 7cf5a3b4fc9f4e5afaf8b41816d98311eceb5658..e3ada79960493a48fb4338a755500cd6cab453ea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.6.3 Dec 16 2014:
+Client:
+  o Fix deferred encryption/decryption parameters (#6500).
+
+0.6.2 Dec 11 2014:
+Client:
+  o Fix incorrect ssl context setup.
+
 0.6.1 Dec 08 2014:
 Client:
   o Use TLS v1 in soledad client. Fixes partially #6437
diff --git a/client/changes/bug_6500_fix-deferred-enc-dec b/client/changes/bug_6500_fix-deferred-enc-dec
deleted file mode 100644
index f3361507bf0c27ebb06597d29c98a8ec1aa8d8ed..0000000000000000000000000000000000000000
--- a/client/changes/bug_6500_fix-deferred-enc-dec
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix deferred encryption/decryption parameters (#6500).