diff --git a/open-iscsi-2.1.4-suse.tar.bz2 b/open-iscsi-2.1.4-suse.tar.bz2
index ef0d570..61996bc 100644
--- a/open-iscsi-2.1.4-suse.tar.bz2
+++ b/open-iscsi-2.1.4-suse.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f65e8be253af8db46417539d1ec8f4dbbd9ed52ea7f8b697a7f2bb229947b77
-size 492101
+oid sha256:baf4a73e2992974c3b28aa6c059d550a9117a792be4ffce80ec4ae6a7d84f566
+size 491997
diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2
index 1f82a91..7bc8ec0 100644
--- a/open-iscsi-SUSE-latest.diff.bz2
+++ b/open-iscsi-SUSE-latest.diff.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058
-size 14
+oid sha256:838df4bb8030fa7748f0686b9eca4d7e0fc42946d37ed4625c3bcb1d9016c934
+size 2365
diff --git a/open-iscsi.changes b/open-iscsi.changes
index 156a773..1e8cd31 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Apr 28 16:26:08 UTC 2021 - Lee Duncan <lduncan@suse.com>
+
+- Local (SUSE) change: update iscsi.service so that it tries to
+  logon to any "onboot" and firmware targets, in case a target
+  was offline when booted but back up when the service is started.
+  (bsc#1153806)
+
+-------------------------------------------------------------------
+Wed Apr 28 15:34:43 UTC 2021 - Lee Duncan <lduncan@suse.com>
+
+- Merged with latest from upstream, which contains these fixes:
+  * Add "no wait" option to iscsiadm firmware login
+  * Check for ISCSI_ERR_ISCSID_NOTCONN in iscsistart
+  * Log proper error message when AUTH failure occurs
+
 -------------------------------------------------------------------
 Thu Mar 11 21:29:25 UTC 2021 - Lee Duncan <lduncan@suse.com>