diff --git a/zfs/lib/libuutil/Makefile.in b/zfs/lib/libuutil/Makefile.in
index 213def56b7..815d7c9eb5 100644
--- a/zfs/lib/libuutil/Makefile.in
+++ b/zfs/lib/libuutil/Makefile.in
@@ -15,8 +15,8 @@ HOSTCFLAGS += -DNATIVE_BUILD
 
 HOSTLDFLAGS += -pthread
 HOSTLDFLAGS += -lrt
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
 
 hostprogs-y := zu
 always := $(hostprogs-y)
diff --git a/zfs/zcmd/zdb/Makefile.in b/zfs/zcmd/zdb/Makefile.in
index bed5e2ce64..b7e462302d 100644
--- a/zfs/zcmd/zdb/Makefile.in
+++ b/zfs/zcmd/zdb/Makefile.in
@@ -14,7 +14,7 @@ HOSTCFLAGS += -I@LIBDIR@/libzfs/include
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
 HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
 HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
 HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
 
diff --git a/zfs/zcmd/zdump/Makefile.in b/zfs/zcmd/zdump/Makefile.in
index af471a3eed..23c6744ba1 100644
--- a/zfs/zcmd/zdump/Makefile.in
+++ b/zfs/zcmd/zdump/Makefile.in
@@ -14,7 +14,7 @@ HOSTCFLAGS += -I@LIBDIR@/libzfs/include
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
 HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
 HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
 HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
 
diff --git a/zfs/zcmd/zfs/Makefile.in b/zfs/zcmd/zfs/Makefile.in
index 06660597ce..602b318929 100644
--- a/zfs/zcmd/zfs/Makefile.in
+++ b/zfs/zcmd/zfs/Makefile.in
@@ -14,7 +14,7 @@ HOSTCFLAGS += -I@LIBDIR@/libzfs/include
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
 HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
 HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
 HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
 
diff --git a/zfs/zcmd/zinject/Makefile.in b/zfs/zcmd/zinject/Makefile.in
index c93d03a7d5..947eac9564 100644
--- a/zfs/zcmd/zinject/Makefile.in
+++ b/zfs/zcmd/zinject/Makefile.in
@@ -14,7 +14,7 @@ HOSTCFLAGS += -I@LIBDIR@/libzfs/include
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
 HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
 HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
 HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
 
diff --git a/zfs/zcmd/zpool/Makefile.in b/zfs/zcmd/zpool/Makefile.in
index 749e14dfff..10727069d8 100644
--- a/zfs/zcmd/zpool/Makefile.in
+++ b/zfs/zcmd/zpool/Makefile.in
@@ -14,7 +14,7 @@ HOSTCFLAGS += -I@LIBDIR@/libzfs/include
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
 HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
 HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
 HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs
 
diff --git a/zfs/zcmd/ztest/Makefile.in b/zfs/zcmd/ztest/Makefile.in
index 1ea28f27c9..9d01532f1f 100644
--- a/zfs/zcmd/ztest/Makefile.in
+++ b/zfs/zcmd/ztest/Makefile.in
@@ -14,7 +14,7 @@ HOSTCFLAGS += -I@LIBDIR@/libzfs/include
 HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl
 HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair
 HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil
-HOSTLDFLAGS += -lzport -L@LIBDIR@/libspl
+HOSTLDFLAGS += -lspl -L@LIBDIR@/libspl
 HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon
 HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs