diff --git a/OvmfPkg/AcpiTables/Dsdt.asl b/OvmfPkg/AcpiTables/Dsdt.asl
index a0c762291e..32fc3d0f72 100644
--- a/OvmfPkg/AcpiTables/Dsdt.asl
+++ b/OvmfPkg/AcpiTables/Dsdt.asl
@@ -364,11 +364,11 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 1, "INTEL ", "OVMF    ", 3) {
             IO (Decode16, 0x278, 0x278, 0x00, 0x08)
             IO (Decode16, 0x370, 0x370, 0x00, 0x02)
             IO (Decode16, 0x378, 0x378, 0x00, 0x08)
-            IO (Decode16, 0x400, 0x400, 0x00, 0x40)       // PMBLK1
             IO (Decode16, 0x440, 0x440, 0x00, 0x10)
             IO (Decode16, 0x678, 0x678, 0x00, 0x08)
             IO (Decode16, 0x778, 0x778, 0x00, 0x08)
             IO (Decode16, 0xafe0, 0xafe0, 0x00, 0x04)     // QEMU GPE0 BLK
+            IO (Decode16, 0xb000, 0xb000, 0x00, 0x40)     // PMBLK1
             Memory32Fixed (ReadOnly, 0xFEC00000, 0x1000)  // IO APIC
             Memory32Fixed (ReadOnly, 0xFEE00000, 0x1000)
           })
diff --git a/OvmfPkg/AcpiTables/Platform.h b/OvmfPkg/AcpiTables/Platform.h
index a79bfd8703..8bba992d01 100644
--- a/OvmfPkg/AcpiTables/Platform.h
+++ b/OvmfPkg/AcpiTables/Platform.h
@@ -33,12 +33,12 @@
 #define ACPI_ENABLE     0
 #define ACPI_DISABLE    0
 #define S4BIOS_REQ      0x00
-#define PM1a_EVT_BLK    0x00000400
+#define PM1a_EVT_BLK    0x0000b000
 #define PM1b_EVT_BLK    0x00000000
-#define PM1a_CNT_BLK    0x00000404
+#define PM1a_CNT_BLK    0x0000b004
 #define PM1b_CNT_BLK    0x00000000
 #define PM2_CNT_BLK     0x00000022
-#define PM_TMR_BLK      0x00000408
+#define PM_TMR_BLK      0x0000b008
 #define GPE0_BLK        0x0000afe0
 #define GPE1_BLK        0x00000000
 #define PM1_EVT_LEN     0x04
diff --git a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index a2f774f7ee..248eb9285a 100644
--- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -24,7 +24,7 @@
 //
 // PIIX4 Power Management Base Address
 //
-UINT32 mPmba = 0x400;
+UINT32 mPmba = 0xb000;
 
 #define PCI_BAR_IO             0x1
 #define ACPI_TIMER_FREQUENCY   3579545