diff --git a/ChangeLog b/ChangeLog
index caa6c4383..718384f8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-15  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* hw/xfree86/os-support/linux/lnx_acpi.c:
+	Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery 
+	Inozemtsev)
+
 2006-05-14  Matthieu Herrb <matthieu.herrb@laas.fr>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 306b41f20..40d61bb47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1064,7 +1064,7 @@ if test "x$XORG" = xyes -o "x$XGL" = xyes; then
 			XORG_OS_PCI="axp"
 			xorg_bus_linuxpci="no"
 			;;
-		  x86*)
+		  i*86|amd64*|x86_64*)
 			linux_acpi="yes"
 			;;
 		  *)
diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c
index 3d048c750..0c69ea172 100644
--- a/hw/xfree86/os-support/linux/lnx_acpi.c
+++ b/hw/xfree86/os-support/linux/lnx_acpi.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_XORG_CONFIG_H
+#include "xorg-config.h"
+#endif
+
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"