diff --git a/0009-libiscsi.patch b/0009-libiscsi.patch
index 32b9b4a..b90686b 100644
--- a/0009-libiscsi.patch
+++ b/0009-libiscsi.patch
@@ -69,9 +69,13 @@ new file mode 100644
 index 000000000000..317a7ec4db30
 --- /dev/null
 +++ b/libiscsi/Makefile
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,65 @@
 +# This Makefile will work only with GNU make.
 +
++ifeq ($(TOPDIR),)
++	TOPDIR = ..
++endif
++
 +OSNAME=$(shell uname -s)
 +OPTFLAGS ?= -O2 -g
 +WARNFLAGS ?= -Wall -Wstrict-prototypes
@@ -115,7 +119,7 @@ index 000000000000..317a7ec4db30
 +	$(CC) $(CFLAGS) -c $< -o $@
 +
 +$(LIB): $(COMMON_OBJS) $(FW_OBJS) $(USR_OBJS) libiscsi.o
-+	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@
++	$(CC) $(CFLAGS) -shared -Wl,-soname,$(LIB) $^ -o $@ -L$(TOPDIR)/libopeniscsiusr -lopeniscsiusr
 +	ln -s -f $(LIB) libiscsi.so
 +
 +$(TESTS): $(FW_OBJS) $(COMMON_OBJS) $(USR_OBJS) $(LIB)
diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 07480ee..87513f3 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -13,7 +13,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 2.git%{shortcommit0}%{?dist}
+Release: 3.git%{shortcommit0}%{?dist}
 Group: System Environment/Daemons
 License: GPLv2+
 URL: http://www.open-iscsi.org
@@ -346,6 +346,9 @@ fi
 %{python3_sitearch}/*
 
 %changelog
+* Mon Jun 25 2018 Adam Williamson <awilliam@redhat.com> - 6.2.0.876-3.git4ef9261
+- Link libiscsi against libopeniscsiusr (bz #1594946) (python 3.6 build)
+
 * Wed Jun 20 2018 Miro Hrončok <mhroncok@redhat.com> - 6.2.0.876-2.git4ef9261
 - Rebuilt for Python 3.7