diff -u xorg-server-1.4.1~git20080131/debian/changelog xorg-server-1.4.1~git20080131/debian/changelog
--- xorg-server-1.4.1~git20080131/debian/changelog
+++ xorg-server-1.4.1~git20080131/debian/changelog
@@ -1,3 +1,14 @@
+xorg-server (2:1.4.1~git20080131-1ubuntu9) hardy; urgency=low
+
+  * debian/patches/series,
+    debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch:
+    - Turn on patch included in previous commit - obviously accidentially
+      forgotten.
+    - Now that its really enabled, make it apply to 1.4.1 code base
+      accordingly. (LP: #182038)
+
+ -- Alexander Sack <asac@ubuntu.com>  Tue, 15 Apr 2008 18:23:51 +0200
+
 xorg-server (2:1.4.1~git20080131-1ubuntu8) hardy; urgency=low
 
   * debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch:
diff -u xorg-server-1.4.1~git20080131/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch xorg-server-1.4.1~git20080131/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch
--- xorg-server-1.4.1~git20080131/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch
+++ xorg-server-1.4.1~git20080131/debian/patches/165_fedora_xserver-1.5.0-xaa-option-inversion.patch
@@ -6,13 +6,18 @@
 Say Option "XaaOffscreenPixmaps" to turn them back on.
 ---
  hw/xfree86/xaa/xaaInitAccel.c |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
-index 1b7c154..f3c8f56 100644
---- a/hw/xfree86/xaa/xaaInitAccel.c
-+++ b/hw/xfree86/xaa/xaaInitAccel.c
-@@ -43,7 +43,8 @@ typedef enum {
+Index: xorg-server-1.4.1~git20080131/hw/xfree86/xaa/xaaInitAccel.c
+===================================================================
+--- xorg-server-1.4.1~git20080131.orig/hw/xfree86/xaa/xaaInitAccel.c
++++ xorg-server-1.4.1~git20080131/hw/xfree86/xaa/xaaInitAccel.c
+@@ -38,17 +38,18 @@
+     XAAOPT_CPU_TO_SCREEN_COL_EXP_FILL,
+     XAAOPT_SCANLINE_CPU_TO_SCREEN_COL_EXP_FILL,
+     XAAOPT_SCREEN_TO_SCREEN_COL_EXP_FILL,
+     XAAOPT_IMAGE_WRITE_RECT,
+     XAAOPT_SCANLINE_IMAGE_WRITE_RECT,
      XAAOPT_WRITE_BITMAP,
      XAAOPT_WRITE_PIXMAP,
      XAAOPT_PIXMAP_CACHE,
@@ -22,7 +27,17 @@
  } XAAOpts;
  
  static const OptionInfoRec XAAOptions[] = {
-@@ -89,6 +90,8 @@ static const OptionInfoRec XAAOptions[] = {
+     {XAAOPT_SCREEN_TO_SCREEN_COPY,	"XaaNoScreenToScreenCopy",
+ 				OPTV_BOOLEAN,	{0}, FALSE },
+     {XAAOPT_SOLID_FILL_RECT,		"XaaNoSolidFillRect",
+ 				OPTV_BOOLEAN,	{0}, FALSE },
+     {XAAOPT_SOLID_FILL_TRAP,		"XaaNoSolidFillTrap",
+@@ -84,16 +85,18 @@
+     {XAAOPT_WRITE_BITMAP,		"XaaNoWriteBitmap",
+ 				OPTV_BOOLEAN,	{0}, FALSE },
+     {XAAOPT_WRITE_PIXMAP,		"XaaNoWritePixmap",
+ 				OPTV_BOOLEAN,	{0}, FALSE },
+     {XAAOPT_PIXMAP_CACHE,		"XaaNoPixmapCache",
  				OPTV_BOOLEAN,	{0}, FALSE },
      {XAAOPT_OFFSCREEN_PIXMAPS,		"XaaNoOffscreenPixmaps",
  				OPTV_BOOLEAN,	{0}, FALSE },
@@ -34,13 +49,25 @@
-@@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
+ 
+ static MODULESETUPPROTO(xaaSetup);
+ 
+ static XF86ModuleVersionInfo xaaVersRec =
+ {
+@@ -537,17 +540,18 @@
+ 	else if(HaveScanlineImageWriteRect)
+ 	    xf86ErrorF("\tScanline Image Writes\n");
+ 
+     }
+ 
  #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
  
      if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
--		!xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
--		                      FALSE)) {
+-		!xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) {
 +		xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
 +    {
  	XAAMSG("\tOffscreen Pixmaps\n");
      } else {
  	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
--- 
-1.5.4.3
+     }
+ 
+ 
+     /************** Mid Level *************/
+ 
diff -u xorg-server-1.4.1~git20080131/debian/patches/series xorg-server-1.4.1~git20080131/debian/patches/series
--- xorg-server-1.4.1~git20080131/debian/patches/series
+++ xorg-server-1.4.1~git20080131/debian/patches/series
@@ -61,0 +62 @@
+165_fedora_xserver-1.5.0-xaa-option-inversion.patch