diff --git a/lib/iscsi/Makefile b/lib/iscsi/Makefile
index 9689000f8..51e9fca4e 100644
--- a/lib/iscsi/Makefile
+++ b/lib/iscsi/Makefile
@@ -46,4 +46,6 @@ C_SRCS = conn.c \
 LIBNAME = iscsi
 LOCAL_SYS_LIBS = -lcrypto
 
+SPDK_MAP_FILE = $(abspath $(CURDIR)/spdk_iscsi.map)
+
 include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk
diff --git a/lib/iscsi/spdk_iscsi.map b/lib/iscsi/spdk_iscsi.map
new file mode 100644
index 000000000..0475a800d
--- /dev/null
+++ b/lib/iscsi/spdk_iscsi.map
@@ -0,0 +1,11 @@
+{
+	global:
+
+	# Functions used by other SPDK libraries
+	spdk_iscsi_init;
+	spdk_iscsi_fini;
+	spdk_iscsi_config_text;
+	spdk_iscsi_config_json;
+
+	local: *;
+};
diff --git a/shared_lib/spdk.map b/shared_lib/spdk.map
index 7f980eba5..ecc9119ff 100644
--- a/shared_lib/spdk.map
+++ b/shared_lib/spdk.map
@@ -5,7 +5,6 @@
 	rte_vhost_*;
 	virt*;
 	SPDK_LOG*;
-	g_spdk_iscsi_opts;
 	_spdk_trace_record;
 	g_trace_histories;
 
diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh
index 3f1014f6e..9c0e82452 100755
--- a/test/make/check_so_deps.sh
+++ b/test/make/check_so_deps.sh
@@ -39,6 +39,8 @@ function confirm_abi_deps() {
 	name = SPDK_LOG_FTL_CORE
 [suppress_variable]
 	name = SPDK_LOG_FTL_INIT
+[suppress_variable]
+	name = SPDK_LOG_ISCSI
 
 EOF