diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2
index 59fdc39..1a9f80a 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:ed3d8cbf0dba53fc8fbd9d8a334d6f16c948890a0c1692b1617cb39c0dac08e4
-size 1330
+oid sha256:22d0da2fae9b69f691b462b449ef32fcfe2bbe8e8525819139c3bef24bb1d407
+size 4555
diff --git a/open-iscsi.changes b/open-iscsi.changes
index 2327b41..9049c81 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Mon Jun  8 16:42:42 UTC 2020 - Lee Duncan <lduncan@suse.com>
+
+- Merged in latest upstream. Summary:
+ * Let initiator name be created by iscsi-init.service.
+ * iscsi: fix fd leak
+ * iscsi: Add break to while loop
+ * Fix compiler complaint about string copy in iscsiuio
+ * Fix a compiler complaint about writing one byte
+ * Fix issue with zero-length arrays at end of struct
+ * Add iscsi-init.service
+ * Proper disconnect of TCP connection
+ * Fix SIGPIPE loop in signal handler
+ * Update iscsi-iname.c
+ * log:modify iSCSI shared memory permissions for logs
+ * Ignore iface.example in iface match checks
+ * More changes for musl.
+ * Fix type mismatch under musl.
+ * Change include of <sys/poll.h> to <poll.h>
+ * iscsi-iname: fix iscsi-iname -p access NULL pointer without given IQN prefix
+
+ Note that the "Add iscsi-init.service" change adds a new systemd
+ service called "iscsi-init", that creates the iSCSI initiator name
+ file /etc/iscsi/initiatorname.iscsi, if and only if it does not
+ exist. This obviates the need to do this from the SPEC file, now
+ updated.
+
+ Since this was not a version-number update, in addition to modifying
+ the SPEC file, also updates:
+  * open-iscsi-SUSE-latest.diff.bz2
+
 -------------------------------------------------------------------
 Sat May  2 15:06:18 UTC 2020 - Lee Duncan <lduncan@suse.com>
 
diff --git a/open-iscsi.spec b/open-iscsi.spec
index 4d60c86..0bd5589 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -140,9 +140,6 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}
 
 %post
 %{?regenerate_initrd_post}
-if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then
-    /sbin/iscsi-gen-initiatorname
-fi
 %service_add_post iscsi.service iscsid.service iscsid.socket
 
 %posttrans
@@ -186,6 +183,7 @@ fi
 %{_sysconfdir}/iscsid.conf
 %{_unitdir}/iscsid.service
 %{_unitdir}/iscsid.socket
+%{_unitdir}/iscsi-init.service
 %{_unitdir}/iscsi.service
 %{_systemdgeneratordir}/ibft-rule-generator
 %{_sbindir}/rciscsi