diff --git a/board/common/qemu/Config.in.in b/board/common/qemu/Config.in.in
index d73922ac..6efc9fba 100644
--- a/board/common/qemu/Config.in.in
+++ b/board/common/qemu/Config.in.in
@@ -118,6 +118,9 @@ config QEMU_RW_VAR
 	default "var.ext4"
 endif
 
+config QEMU_VPD
+	bool "Emulate a Vital Product Data (VPD) Memory"
+
 config QEMU_HOST
 	string "Export host filesystem path"
 	default "/tmp"
diff --git a/board/common/qemu/qemu.sh b/board/common/qemu/qemu.sh
index 2bfffac0..5213ebf4 100755
--- a/board/common/qemu/qemu.sh
+++ b/board/common/qemu/qemu.sh
@@ -196,6 +196,8 @@ net_args()
 # Vital Product data
 vpd_args()
 {
+    [ "$CONFIG_QEMU_VPD" = "y" ] || return
+
     vpd_file="${imgdir}/vpd"
 
     if ! [ -f "$vpd_file" ]; then