diff --git a/board/common/Config.in b/board/common/Config.in
index 376badb0..760b6260 100644
--- a/board/common/Config.in
+++ b/board/common/Config.in
@@ -15,6 +15,7 @@ source "$BR2_EXTERNAL_INFIX_PATH/board/common/image/image-itb-dl-release/Config.
 
 comment "General"
 source "$BR2_EXTERNAL_INFIX_PATH/board/common/image/image-barebox-esp/Config.in"
+source "$BR2_EXTERNAL_INFIX_PATH/board/common/image/image-lvm-stub/Config.in"
 source "$BR2_EXTERNAL_INFIX_PATH/board/common/image/image-readme/Config.in"
 
 endmenu
diff --git a/board/common/image/image-lvm-stub/Config.in b/board/common/image/image-lvm-stub/Config.in
new file mode 100644
index 00000000..c03a0b19
--- /dev/null
+++ b/board/common/image/image-lvm-stub/Config.in
@@ -0,0 +1,8 @@
+config IMAGE_LVM_STUB
+	bool "LVM2 stub image"
+	default y if IMAGE_DDI
+	help
+	  An empty LVM2 physical volume attached to the internal
+	  volume group. This is useful as a base image for persistent
+	  storage in QEMU emulation scenarios where the OS is supplied
+	  in a separate image.
diff --git a/board/common/image/image-lvm-stub/generate.sh b/board/common/image/image-lvm-stub/generate.sh
new file mode 100755
index 00000000..4c865bcd
--- /dev/null
+++ b/board/common/image/image-lvm-stub/generate.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+set -e
+
+
+mkdir -p "${WORKDIR}"/root
+rm -rf   "${WORKDIR}"/tmp
+mkdir -p "${WORKDIR}"/tmp
+
+"${BR2_EXTERNAL_INFIX_PATH}"/utils/lvm-mkinternal >"${WORKDIR}"/stub.lvm
+
+cat <<EOF >"${WORKDIR}"/genimage.cfg
+image lvm-stub.disk {
+	hdimage {
+		partition-table-type = "gpt"
+	}
+
+	partition internal {
+		growfs = "true"
+		image = "stub.lvm"
+		partition-type-uuid = "lvm"
+	}
+}
+
+# Silence genimage warnings
+config {}
+EOF
+
+genimage \
+    --tmppath    "${WORKDIR}"/tmp  \
+    --rootpath   "${WORKDIR}"/root \
+    --inputpath  "${WORKDIR}"      \
+    --outputpath "${BINARIES_DIR}" \
+    --config "${WORKDIR}"/genimage.cfg
diff --git a/board/common/image/image-lvm-stub/image-lvm-stub.mk b/board/common/image/image-lvm-stub/image-lvm-stub.mk
new file mode 100644
index 00000000..98d09bce
--- /dev/null
+++ b/board/common/image/image-lvm-stub/image-lvm-stub.mk
@@ -0,0 +1,7 @@
+################################################################################
+#
+# image-lvm-stub
+#
+################################################################################
+
+$(eval $(ix-image))