diff --git a/src/arch/x86/acpi.c b/src/arch/x86/acpi.c
index 1b8aaae64b..71fc4e208f 100644
--- a/src/arch/x86/acpi.c
+++ b/src/arch/x86/acpi.c
@@ -864,7 +864,7 @@ unsigned long acpi_write_hpet(struct device *device, unsigned long current,
 
 	hpet = (acpi_hpet_t *) current;
 	current += sizeof(acpi_hpet_t);
-	current = ALIGN(current, 16);
+	current = ALIGN_UP(current, 16);
 	acpi_create_hpet(hpet);
 	acpi_add_table(rsdp, hpet);
 
@@ -1322,7 +1322,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	acpi_write_xsdt(xsdt, oem_id, oem_table_id);
 
 	printk(BIOS_DEBUG, "ACPI:    * FACS\n");
-	current = (ALIGN(current, 64));
+	current = ALIGN_UP(current, 64);
 	facs = (acpi_facs_t *) current;
 	current += sizeof(acpi_facs_t);
 	current = acpi_align_current(current);
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index e48b2da567..6251b98142 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -1004,7 +1004,7 @@ static inline int acpi_is_wakeup_s4(void) { return 0; }
 
 static inline uintptr_t acpi_align_current(uintptr_t current)
 {
-	return ALIGN(current, 16);
+	return ALIGN_UP(current, 16);
 }
 
 /* ACPI table revisions should match the revision of the ACPI spec