diff --git a/xserver-1.4.99-apm-typedefs.patch b/xserver-1.4.99-apm-typedefs.patch
index 9d18b5a..9b9fddf 100644
--- a/xserver-1.4.99-apm-typedefs.patch
+++ b/xserver-1.4.99-apm-typedefs.patch
@@ -1,12 +1,26 @@
-From b9119f9e0b0166c46114f9715a8064582131ab1d Mon Sep 17 00:00:00 2001
+From 3fd969f08e4f550ac28fee3bbdbe55e9db872091 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax@redhat.com>
 Date: Mon, 3 Dec 2007 14:00:25 -0500
 Subject: [PATCH] apm_event_t workaround
 
 ---
+ hw/kdrive/linux/linux.c               |    2 ++
  hw/xfree86/os-support/linux/lnx_apm.c |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
+ 2 files changed, 5 insertions(+), 0 deletions(-)
 
+diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
+index 23cd8f5..2f9cb62 100644
+--- a/hw/kdrive/linux/linux.c
++++ b/hw/kdrive/linux/linux.c
+@@ -275,6 +275,8 @@ LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+ 
+ static Bool LinuxApmRunning;
+ 
++#define apm_event_t unsigned short
++
+ static void
+ LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
+ {
 diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
 index 16ac80d..6bcae47 100644
 --- a/hw/xfree86/os-support/linux/lnx_apm.c