diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index c4b9834dc..17d342d9b 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,29 +3,29 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.5.2          \
-5.4.18-nc      \
+5.5.5          \
+5.4.21-nc      \
 5.3.18-nc      \
 5.2.21-nc      \
 5.1.21-nc      \
 5.0.21-nc      \
 4.20.17-nc     \
-4.19.102-nc    \
+4.19.105-nc    \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.170-nc    \
+4.14.171-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.213-nc     \
+4.9.214-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.213-nc     \
+4.4.214-nc     \
 4.3.6-nc       \
 4.2.8-nc       \
 4.1.52-nc      \
@@ -33,7 +33,7 @@ ABT_KERNELS="  \
 3.19.8-nc      \
 3.18.140-nc    \
 3.17.8-nc      \
-3.16.81-nc     \
+3.16.82-nc     \
 3.15.10-nc     \
 3.14.79-nc     \
 3.13.11-nc     \
diff --git a/scst/ChangeLog b/scst/ChangeLog
index 140030676..5bc0acba2 100644
--- a/scst/ChangeLog
+++ b/scst/ChangeLog
@@ -1,7 +1,14 @@
 Summary of changes between versions 3.4 and 3.5
 -----------------------------------------------
 - Added the forward_src and forward_dst sysfs attributes. Removed
-  CONFIG_SCST_FORWARD_MODE_PASS_THROUGH.
+  CONFIG_SCST_FORWARD_MODE_PASS_THROUGH. In other words, forward_src mode
+  is no longer global but is now configurable per target port.
+- Improved forwarding of SCSI commands between H.A. nodes. The relative
+  target port ID is now correct in the device identification inquiry response.
+  The REPORT TARGET PORT GROUPS and SET TARGET PORT GROUPS commands are now
+  processed locally instead of being forwarded.
+- Fixed a hard to trigger race condition in the iSCSI connection shutdown code.
+- Added support for unaligned buffers in vdisk_blockio.
 
 Summary of changes between versions 3.3 and 3.4
 -----------------------------------------------