diff -ur work.orig/xc/config/cf/xf86.tmpl work/xc/config/cf/xf86.tmpl
--- work.orig/xc/config/cf/xf86.tmpl	2004-09-17 00:10:20.542135376 +0200
+++ work/xc/config/cf/xf86.tmpl	2004-04-23 20:41:59.000000000 +0200
@@ -61,11 +61,7 @@
 MODULE_GCC_FLAGS2 = -fno-merge-constants
 #endif
 
-#if HasGcc
-MODULE_GCC_FLAGS3 = -fno-pie
-#endif
-
-MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) $(MODULE_GCC_FLAGS3)
+MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2)
 
 #if defined(IHaveModules) && MakeDllModules
 MODULE_PIC_FLAGS = $(PICFLAGS)
diff -ur work.orig/xc/config/cf/xorg.tmpl work/xc/config/cf/xorg.tmpl
--- work.orig/xc/config/cf/xorg.tmpl	2004-09-17 00:09:41.929005464 +0200
+++ work/xc/config/cf/xorg.tmpl	2004-04-23 20:41:59.000000000 +0200
@@ -75,11 +75,7 @@
 MODULE_GCC_FLAGS2 = -fno-merge-constants
 #endif
 
-#if HasGcc
-MODULE_GCC_FLAGS3 = -fno-pie
-#endif
-
-MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2) $(MODULE_GCC_FLAGS3)
+MODULE_GCC_FLAGS = $(MODULE_GCC_FLAGS1) $(MODULE_GCC_FLAGS2)
 
 #if defined(IHaveModules) && MakeDllModules
 MODULE_PIC_FLAGS = $(PICFLAGS)