diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index b289251264776cd37a1ba33eab2169a822aa6f71..4acb97a8c528575b6a8c066e0a37a5c99214b04e 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -1,3 +1,21 @@
+tbd         Cluster File Systems, Inc. <info@clusterfs.com>
+       * version 1.6.5
+       * Support for kernels:
+        2.6.5-7.286 (SLES 9),
+        2.6.9-55.0.9.EL (RHEL 4),
+        2.6.16.53-0.8 (SLES 10),
+        2.6.18-8.1.14.el5 (RHEL 5),
+        2.6.18.8 vanilla (kernel.org)
+       * Client support for unpatched kernels:
+        (see http://wiki.lustre.org/index.php?title=Patchless_Client)
+        2.6.16 - 2.6.22 vanilla (kernel.org)
+       * Due to recently discovered recovery problems, we do not recommend
+        using patchless RHEL 4 clients with this or any earlier release.
+       * Recommended e2fsprogs version: 1.40.2-cfs1
+       * Note that reiserfs quotas are disabled on SLES 10 in this kernel.
+
+--------------------------------------------------------------------------------
+
 2007-10-26         Cluster File Systems, Inc. <info@clusterfs.com>
        * version 1.6.4
        * Support for kernels:
diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index 29d09c20d83a2feed1ddb8cf703b6209e6573e5e..fda4109357bbc7148fae2b9d00d2d36b682d5211 100644
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,7 +1,7 @@
 m4_define([LUSTRE_MAJOR],[1])
 m4_define([LUSTRE_MINOR],[6])
 m4_define([LUSTRE_PATCH],[4])
-m4_define([LUSTRE_FIX],[0])
+m4_define([LUSTRE_FIX],[50])
 # Note: we're starting prerelease versions at 50 this time.
 
 dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but