diff --git a/configure b/configure
index 3aded8b48..19a538e7d 100755
--- a/configure
+++ b/configure
@@ -1077,7 +1077,7 @@ elif [[ "${CONFIG[PGO_USE]}" = "y" ]]; then
 	fi
 fi
 
-if [[ "${CONFIG[URING]}" = "y" ]]; then
+if [[ "${CONFIG[URING]}" = "y" || "${CONFIG[XNVME]}" = "y" ]]; then
 	if [[ -n "${CONFIG[URING_PATH]}" ]]; then
 		check_dir "${CONFIG[URING_PATH]}"
 	elif ! echo -e '#include <liburing.h>\nint main(void) { return 0; }\n' \
diff --git a/mk/spdk.common.mk b/mk/spdk.common.mk
index dc157ca6c..0d8ecd0c5 100644
--- a/mk/spdk.common.mk
+++ b/mk/spdk.common.mk
@@ -220,6 +220,9 @@ XNVME_INCLUDE_DIR=$(XNVME_DIR)/include
 CFLAGS += -I$(XNVME_INCLUDE_DIR)
 LDFLAGS += -L$(XNVME_INSTALL_DIR)
 SYS_LIBS += -lxnvme
+ifneq ($(CONFIG_URING), y)
+SYS_LIBS += -luring
+endif
 endif
 
 ifeq ($(CONFIG_DAOS),y)
diff --git a/xnvme b/xnvme
index e507f2d17..59cca28a6 160000
--- a/xnvme
+++ b/xnvme
@@ -1 +1 @@
-Subproject commit e507f2d1791163d0c2757f1b973cd2cf6dfcb573
+Subproject commit 59cca28a61ae3154ba1731ca2ee7daa402ec5e2e
diff --git a/xnvmebuild/Makefile b/xnvmebuild/Makefile
index 60b8279ff..30dec5aeb 100644
--- a/xnvmebuild/Makefile
+++ b/xnvmebuild/Makefile
@@ -11,7 +11,11 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
 all:
 	(cd $(SPDK_ROOT_DIR)/xnvme && \
 		export PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:/usr/lib/pkgconfig:/usr/lib64/pkgconfig && \
-		meson setup builddir -Dwith-spdk=false -Dwith-fio=false -Dshared_library=false && \
+		meson setup builddir \
+		-Dwith-spdk=false \
+		-Dwith-fio=false \
+		-Dwith-libvfn=false \
+		-Dshared_library=false && \
 		meson compile -C builddir && \
 		cd -)