diff --git a/conf/machine/x64.conf b/conf/machine/x64.conf
index 8ec9c0493..12b099c87 100644
--- a/conf/machine/x64.conf
+++ b/conf/machine/x64.conf
@@ -10,6 +10,8 @@ DEFAULTTUNE ?= "core2-64"
 require conf/machine/include/x86/tune-core2.inc
 require conf/machine/include/x86/x86-base.inc
 
+MACHINE_FEATURES:append = " tpm2"
+
 XSERVER = "\
 	${XSERVER_X86_BASE} \
 	${XSERVER_X86_EXT} \
diff --git a/recipes-core/ovmf/ovmf_%.bbappend b/recipes-core/ovmf/ovmf_%.bbappend
new file mode 100644
index 000000000..813096f48
--- /dev/null
+++ b/recipes-core/ovmf/ovmf_%.bbappend
@@ -0,0 +1,5 @@
+do_deploy:class-target:append() {
+    install --mode 0644 -t ${DEPLOYDIR}/ \
+        ${WORKDIR}/ovmf/ovmf.code.fd \
+        ${WORKDIR}/ovmf/ovmf.vars.fd
+}