diff --git a/META b/META
index aa3c1da588..c8865df891 100644
--- a/META
+++ b/META
@@ -1,7 +1,7 @@
 Meta:         1
 Name:         zfs
 Branch:       1.0
-Version:      0.6.5.3
+Version:      0.6.5.4
 Release:      1
 Release-Tags: relext
 License:      CDDL
diff --git a/rpm/generic/zfs-kmod.spec.in b/rpm/generic/zfs-kmod.spec.in
index 68f94c19d1..f314d9a415 100644
--- a/rpm/generic/zfs-kmod.spec.in
+++ b/rpm/generic/zfs-kmod.spec.in
@@ -185,6 +185,15 @@ chmod u+x ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/*/extra/*/*/*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan  8 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.4-1
+- Linux 4.4 compat
+- Assorted stability fixes
+- Fixes for NFS-exported snapshots
+- Fix kernel warning in unlock_new_inode() and deadlock
+- Fix overflow in P2ROUNDUP_TYPED macro
+- Fix write performance issue due to bad zfs_dirty_data_max calculation
+- Fix builtin kernel builds
+- Fix deadlock during direct memory reclaim
 * Tue Oct 13 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.3-1
 - Don't import all visible pools in zfs-import init script zfsonlinux/zfs#3777
 - Fix use-after-free in vdev_disk_physio_completion zfsonlinux/zfs#3920
diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index 20b59088ec..c7010c2f70 100644
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -332,6 +332,15 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan  8 2016 Ned Bass <bass6@llnl.gov> - 0.6.5.4-1
+- Linux 4.4 compat
+- Assorted stability fixes
+- Fixes for NFS-exported snapshots
+- Fix kernel warning in unlock_new_inode() and deadlock
+- Fix overflow in P2ROUNDUP_TYPED macro
+- Fix write performance issue due to bad zfs_dirty_data_max calculation
+- Fix builtin kernel builds
+- Fix deadlock during direct memory reclaim
 * Tue Oct 13 2015 Ned Bass <bass6@llnl.gov> - 0.6.5.3-1
 - Don't import all visible pools in zfs-import init script zfsonlinux/zfs#3777
 - Fix use-after-free in vdev_disk_physio_completion zfsonlinux/zfs#3920