diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig
index 4d2418703a..082d3e4028 100644
--- a/src/mainboard/asus/p8h61-m_pro/Kconfig
+++ b/src/mainboard/asus/p8h61-m_pro/Kconfig
@@ -30,6 +30,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
 	select DRIVERS_ASMEDIA_ASPM_BLACKLIST
+	select MAINBOARD_HAS_LPC_TPM
 
 config MAINBOARD_DIR
 	string
diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
index 9407aab548..f853452728 100644
--- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb
+++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb
@@ -109,6 +109,9 @@ chip northbridge/intel/sandybridge
 						irq 0xe5 = 0xff
 					end
 				end
+				chip drivers/pc80/tpm
+					device pnp 4e.0 on end		# TPM module
+				end
 			end
 			device pci 1f.2 on  end # SATA Controller 1
 			device pci 1f.3 on  end # SMBus