diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 71841fb591..ee6406049c 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -12,6 +12,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select BOARD_ROMSIZE_KB_16384 if VBOOT
 	select MAINBOARD_HAS_NATIVE_VGA_INIT
 	select MAINBOARD_FORCE_NATIVE_VGA_INIT
+	select MAINBOARD_HAS_LPC_TPM
 
 config VBOOT
 	select VBOOT_MUST_REQUEST_DISPLAY
diff --git a/src/mainboard/emulation/qemu-q35/devicetree.cb b/src/mainboard/emulation/qemu-q35/devicetree.cb
index c032606e67..ff0589fa60 100644
--- a/src/mainboard/emulation/qemu-q35/devicetree.cb
+++ b/src/mainboard/emulation/qemu-q35/devicetree.cb
@@ -8,7 +8,11 @@ chip mainboard/emulation/qemu-q35
 		device pci 0.0 mandatory end		# northbridge (q35)
 		chip southbridge/intel/i82801ix
 			# present unconditionally
-			device pci 1f.0 mandatory end	# LPC
+			device pci 1f.0 mandatory
+				chip drivers/pc80/tpm
+					device pnp 0c31.0 on end
+				end
+			end	# LPC
 			device pci 1f.2 on end	# SATA
 			device pci 1f.3 on end	# SMBus