diff -u x11proto-input-1.4.3/debian/changelog x11proto-input-1.4.3/debian/changelog
--- x11proto-input-1.4.3/debian/changelog
+++ x11proto-input-1.4.3/debian/changelog
@@ -1,3 +1,11 @@
+x11proto-input (1.4.3-2ubuntu4) intrepid; urgency=low
+
+  * 100-Add-Device-Properties-X-Input-1.5.patch: Define Atom as CARD32 in
+    XIproto.h, as otherwise the protocol structs come out completely wrong on
+    amd64. Thanks to Julien Cristau for working this out. (LP: #267611)
+
+ -- William Grant <wgrant@ubuntu.com>  Wed, 15 Oct 2008 12:24:13 +1100
+
 x11proto-input (1.4.3-2ubuntu3) intrepid; urgency=low
 
   * Update 100-Add-Device-Properties-X-Input-1.5.patch to reflect the
diff -u x11proto-input-1.4.3/debian/patches/100-Add-Device-Properties-X-Input-1.5.patch x11proto-input-1.4.3/debian/patches/100-Add-Device-Properties-X-Input-1.5.patch
--- x11proto-input-1.4.3/debian/patches/100-Add-Device-Properties-X-Input-1.5.patch
+++ x11proto-input-1.4.3/debian/patches/100-Add-Device-Properties-X-Input-1.5.patch
@@ -63,9 +63,17 @@
  #define XI_BadEvent	1
 Index: x11proto-input-1.4.3/XIproto.h
 ===================================================================
---- x11proto-input-1.4.3.orig/XIproto.h	2008-09-26 18:14:12.000000000 +0300
-+++ x11proto-input-1.4.3/XIproto.h	2008-09-26 23:50:56.000000000 +0300
-@@ -72,10 +72,11 @@
+--- x11proto-input-1.4.3.orig/XIproto.h	2008-03-06 14:05:38.000000000 +1100
++++ x11proto-input-1.4.3/XIproto.h	2008-10-15 12:09:48.000000000 +1100
+@@ -56,6 +56,7 @@
+ /* make sure types have right sizes for protocol structures. */
+ #define Window CARD32
+ #define Time CARD32
++#define Atom CARD32
+ #define KeyCode CARD8
+ 
+ /*********************************************************
+@@ -72,10 +73,11 @@
  
  #define numInputClasses 7
  
@@ -80,7 +88,7 @@
  
  typedef struct  _XExtEventInfo
      {
-@@ -114,6 +115,7 @@
+@@ -114,6 +116,7 @@
  #define XI_DeviceKeystateNotify		13
  #define XI_DeviceButtonstateNotify	14
  #define XI_DevicePresenceNotify		15
@@ -88,7 +96,7 @@
  
  /*********************************************************
   *
-@@ -156,6 +158,11 @@
+@@ -156,6 +159,11 @@
  #define X_SetDeviceValuators		33
  #define X_GetDeviceControl		34
  #define X_ChangeDeviceControl		35
@@ -100,7 +108,7 @@
  
  /*********************************************************
   *
-@@ -1413,6 +1420,82 @@
+@@ -1413,6 +1421,82 @@
      CARD16          pad1 B16;
  } xDeviceEnableCtl;
  
@@ -183,7 +191,7 @@
  /**********************************************************
   *
   * Input extension events.
-@@ -1600,7 +1683,7 @@
+@@ -1600,7 +1684,7 @@
      BYTE        pad00;
      CARD16 	sequenceNumber B16;
      Time        time B32;
@@ -192,7 +200,7 @@
      BYTE        deviceid;
      CARD16      control B16;
      CARD32	pad02 B32;
-@@ -1610,6 +1693,30 @@
+@@ -1610,6 +1694,30 @@
      CARD32	pad06 B32;
      }  devicePresenceNotify;