diff -ruN xorg-cf-files-1.0.5/Imake.cf xorg-cf-files-1.0.5-patched/Imake.cf
--- xorg-cf-files-1.0.5/Imake.cf	2005-11-07 22:33:24.000000000 -0800
+++ xorg-cf-files-1.0.5-patched/Imake.cf	2009-04-07 13:48:13.000000000 -0700
@@ -33,6 +33,9 @@
 #  define i386DarwinArchitecture
 #  undef __i386__
 # endif
+# ifdef __x86_64__
+#  define x86_64DarwinArchitecture
+# endif
 #endif
 
 #if defined(clipper) || defined(__clipper__)
diff -ruN xorg-cf-files-1.0.5/darwin.cf xorg-cf-files-1.0.5-patched/darwin.cf
--- xorg-cf-files-1.0.5/darwin.cf	2005-03-31 17:22:07.000000000 -0800
+++ xorg-cf-files-1.0.5-patched/darwin.cf	2009-04-07 13:49:24.000000000 -0700
@@ -230,6 +230,16 @@
 # define ByteOrder              X_LITTLE_ENDIAN
 #endif /* i386DarwinArchitecture */
 
+#ifdef x86_64DarwinArchitecture
+# define DarwinMachineDefines   -D__x86_64__
+# if HasGcc3
+#  define OptimizedCDebugFlags  -Os
+# else
+#  define OptimizedCDebugFlags  -O2 -fno-strength-reduce
+# endif
+# define ByteOrder              X_LITTLE_ENDIAN
+#endif /* x86_64DarwinArchitecture */
+
 #if OSMajorVersion < 7
 # define DarwinLocaleDefines    -DX_LOCALE
 #else