diff --git a/cmd/zdb/Makefile.am b/cmd/zdb/Makefile.am
index 469ff7f9ab..6f0b0cb87d 100644
--- a/cmd/zdb/Makefile.am
+++ b/cmd/zdb/Makefile.am
@@ -28,4 +28,4 @@ zdb_LDADD = \
 	$(top_builddir)/lib/libzpool/libzpool.la \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
-zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
+zdb_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
diff --git a/cmd/zfs/Makefile.am b/cmd/zfs/Makefile.am
index 1d21a905a5..4d66e37a22 100644
--- a/cmd/zfs/Makefile.am
+++ b/cmd/zfs/Makefile.am
@@ -29,4 +29,4 @@ zfs_LDADD = \
 	$(top_builddir)/lib/libzpool/libzpool.la \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
-zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
+zfs_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
diff --git a/cmd/zinject/Makefile.am b/cmd/zinject/Makefile.am
index 3dc95532c7..7166ed9b4b 100644
--- a/cmd/zinject/Makefile.am
+++ b/cmd/zinject/Makefile.am
@@ -31,4 +31,4 @@ zinject_LDADD = \
 	$(top_builddir)/lib/libzpool/libzpool.la \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
-zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
+zinject_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
diff --git a/cmd/zpool/Makefile.am b/cmd/zpool/Makefile.am
index 2900abb2f8..3f30eff47d 100644
--- a/cmd/zpool/Makefile.am
+++ b/cmd/zpool/Makefile.am
@@ -30,4 +30,4 @@ zpool_LDADD = \
 	$(top_builddir)/lib/libzpool/libzpool.la \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
-zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID)
+zpool_LDFLAGS = -pthread -lm $(ZLIB) -lrt $(LIBUUID) $(LIBBLKID)
diff --git a/cmd/ztest/Makefile.am b/cmd/ztest/Makefile.am
index 5ed0890dea..8f5ab24932 100644
--- a/cmd/ztest/Makefile.am
+++ b/cmd/ztest/Makefile.am
@@ -29,4 +29,4 @@ ztest_LDADD = \
 	$(top_builddir)/lib/libzpool/libzpool.la \
 	$(top_builddir)/lib/libzfs/libzfs.la
 
-ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID)
+ztest_LDFLAGS = -pthread -lm $(ZLIB) -lrt -ldl $(LIBUUID) $(LIBBLKID)
diff --git a/config/user-libdiskmgt.m4 b/config/user-libdiskmgt.m4
deleted file mode 100644
index 53e043bda4..0000000000
--- a/config/user-libdiskmgt.m4
+++ /dev/null
@@ -1,8 +0,0 @@
-dnl #
-dnl # Check for libdiskmgt
-dnl #
-AC_DEFUN([ZFS_AC_CONFIG_USER_LIBDISKMGT], [
-	AC_CHECK_LIB([diskmgt], [libdiskmgt_error],
-		[AC_DEFINE([HAVE_LIBDISKMGT], 1,
-		[Define to 1 if 'libdiskmgt' library available])])
-])
diff --git a/config/user-zlib.m4 b/config/user-zlib.m4
index 5f2a545823..a48361662e 100644
--- a/config/user-zlib.m4
+++ b/config/user-zlib.m4
@@ -13,6 +13,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_ZLIB], [
 	AC_CHECK_LIB([z], [uncompress], [], [AC_MSG_FAILURE([
 	*** uncompress() missing, zlib-devel package required])])
 
+	AC_CHECK_LIB([z], [crc32], [], [AC_MSG_FAILURE([
+	*** crc32() missing, zlib-devel package required])])
+
 	AC_SUBST([ZLIB], ["-lz"])
 	AC_DEFINE([HAVE_ZLIB], 1, [Define if you have zlib])
 ])
diff --git a/config/user.m4 b/config/user.m4
index f8bda8e0ff..be59e7b4fb 100644
--- a/config/user.m4
+++ b/config/user.m4
@@ -3,7 +3,6 @@ dnl # Default ZFS user configuration
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER], [
 	ZFS_AC_CONFIG_USER_ARCH
-	ZFS_AC_CONFIG_USER_LIBDISKMGT
 	ZFS_AC_CONFIG_USER_LIBSHARE
 	ZFS_AC_CONFIG_USER_IOCTL
 	ZFS_AC_CONFIG_USER_ZLIB
diff --git a/zfs.spec.in b/zfs.spec.in
index 34c32a47f0..f397333987 100644
--- a/zfs.spec.in
+++ b/zfs.spec.in
@@ -42,7 +42,7 @@ various system profiling tools to facilitate an in depth analysis.
 %prep
 %setup
 %build
-%configure --with-config=user
+%configure --with-config=user --with-blkid
 make
 
 %install