diff --git a/config/qemu-moc.config b/config/qemu-moc.config
index b48093ad..18ad85f7 100644
--- a/config/qemu-moc.config
+++ b/config/qemu-moc.config
@@ -6,7 +6,7 @@ CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y
-CONFIG_LIBUUID=y
+CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y
 CONFIG_PCIUTILS=y
diff --git a/config/x230-moc.config b/config/x230-moc.config
index 0543a4c5..1a7dc419 100644
--- a/config/x230-moc.config
+++ b/config/x230-moc.config
@@ -5,13 +5,15 @@ CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y
-CONFIG_LIBUUID=y
+CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y
 CONFIG_PCIUTILS=y
 CONFIG_POPT=y
 CONFIG_QRENCODE=y
 CONFIG_TPMTOTP=y
+
+# xen is not used on the MOC machines
 CONFIG_XEN=n
 
 CONFIG_LINUX_USB=y
diff --git a/config/x230-qubes.config b/config/x230-qubes.config
index c2e6658b..3dad5709 100644
--- a/config/x230-qubes.config
+++ b/config/x230-qubes.config
@@ -5,7 +5,7 @@ CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
 CONFIG_GPG=y
 CONFIG_KEXEC=y
-CONFIG_LIBUUID=y
+CONFIG_UTIL_LINUX=y
 CONFIG_LVM2=y
 CONFIG_MBEDTLS=y
 CONFIG_PCIUTILS=y
@@ -21,4 +21,4 @@ CONFIG_BOOTSCRIPT=/bin/qubes-init
 
 # Disks encrypted by the TPM LUKS key
 CONFIG_QUBES_BOOT_DEV="/dev/sda1"
-CONFIG_QUBES_DEVS="/dev/sda2 /dev/sda3 /dev/sda5"
+CONFIG_QUBES_VG="qubes_dom0"
diff --git a/modules/cryptsetup b/modules/cryptsetup
index e582bbeb..cd6475cc 100644
--- a/modules/cryptsetup
+++ b/modules/cryptsetup
@@ -1,6 +1,6 @@
 modules-$(CONFIG_CRYPTSETUP) += cryptsetup
 
-cryptsetup_depends := libuuid popt lvm2 $(musl_dep)
+cryptsetup_depends := util-linux popt lvm2 $(musl_dep)
 
 cryptsetup_version := 1.7.3
 cryptsetup_dir := cryptsetup-$(cryptsetup_version)
diff --git a/modules/libuuid b/modules/libuuid
deleted file mode 100644
index 5e9fed57..00000000
--- a/modules/libuuid
+++ /dev/null
@@ -1,21 +0,0 @@
-modules-$(CONFIG_LIBUUID) += libuuid
-
-libuuid_version := 1.0.3
-libuuid_dir := libuuid-$(libuuid_version)
-libuuid_tar := libuuid-$(libuuid_version).tar.gz
-libuuid_url := http://downloads.sourceforge.net/project/libuuid/$(libuuid_tar)
-libuuid_hash := 46af3275291091009ad7f1b899de3d0cea0252737550e7919d17237997db5644
-
-libuuid_configure := ./configure \
-	CC="$(heads_cc)" \
-	--prefix "" \
-	--host i386-elf-linux \
-
-libuuid_target := $(MAKE_JOBS) && \
-	$(MAKE) \
-		-C "$(build)/$(libuuid_dir)" \
-		prefix="$(INSTALL)" \
-		install
-
-libuuid_libraries := .libs/libuuid.so.1
-libuuid_depends := $(musl_dep)
diff --git a/modules/lvm2 b/modules/lvm2
index a2afe265..d8f06d89 100644
--- a/modules/lvm2
+++ b/modules/lvm2
@@ -18,15 +18,21 @@ lvm2_configure := \
 	--disable-selinux \
 	--disable-udev-systemd-background-jobs \
 	--disable-realtime \
+	--disable-use-lvmlockd \
+	--disable-use-lvmetad \
+	--disable-use-lvmpolld \
+	--disable-blkid_wiping \
 	--with-cluster=none \
 
 # not sure why LIB_SUFFIX is not defined in the cross build
 lvm2_target := \
 	$(MAKE_JOBS) \
-	install_device-mapper \
+	all install_device-mapper \
 
 lvm2_libraries := libdm/libdevmapper.so.1.02
 
-lvm2_output := tools/dmsetup
+lvm2_output := \
+	tools/dmsetup \
+	tools/lvm \
 
-lvm2_depends := $(musl_dep)
+lvm2_depends := util-linux $(musl_dep)
diff --git a/modules/util-linux b/modules/util-linux
new file mode 100644
index 00000000..51ef81aa
--- /dev/null
+++ b/modules/util-linux
@@ -0,0 +1,34 @@
+modules-$(CONFIG_UTIL_LINUX) += util-linux
+
+util-linux_version := 2.29.2
+util-linux_dir := util-linux-$(util-linux_version)
+util-linux_tar := util-linux-$(util-linux_version).tar.xz
+util-linux_url := https://www.kernel.org/pub/linux/utils/util-linux/v2.29/$(util-linux_tar)
+util-linux_hash := accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3
+
+util-linux_configure := ./configure \
+	CC="$(heads_cc)" \
+	--host i386-elf-linux \
+	--prefix "$(INSTALL)" \
+	--datadir "$(INSTALL)/share" \
+	--oldincludedir "$(INSTALL)/include" \
+	--without-ncurses \
+	--without-ncursesw \
+	--without-tinfo \
+	--without-udev \
+	--without-python \
+	--disable-bash-completion \
+	--disable-all-programs \
+	--enable-libuuid \
+	--enable-libblkid \
+
+
+util-linux_target := \
+	$(MAKE_JOBS) install
+
+util-linux_libraries += .libs/libuuid.so.1
+
+# libblkid is not needed by lvm2, so it is not installed now
+#util-linux_libraries += .libs/libblkid.so.1
+
+util-linux_depends := $(musl_dep)