diff --git a/fix_fglrx_screendepth_issue.patch b/fix_fglrx_screendepth_issue.patch
new file mode 100644
index 0000000..3141571
--- /dev/null
+++ b/fix_fglrx_screendepth_issue.patch
@@ -0,0 +1,28 @@
+--- hw/xfree86/common/xf86AutoConfig.c.orig	2010-03-23 19:36:35.242114919 +0100
++++ hw/xfree86/common/xf86AutoConfig.c	2010-03-23 19:46:34.037124633 +0100
+@@ -75,6 +75,13 @@
+ 	"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
+ 	"EndSection\n\n"
+ 
++#define BUILTIN_SCREEN_SECTION_FOR_FGLRX \
++	"Section \"Screen\"\n" \
++	"\tIdentifier\t" BUILTIN_SCREEN_NAME "\n" \
++	"\tDevice\t" BUILTIN_DEVICE_NAME "\n" \
++	"\tDefaultDepth\t24\n" \
++	"EndSection\n\n"
++
+ #define BUILTIN_LAYOUT_SECTION_PRE \
+ 	"Section \"ServerLayout\"\n" \
+ 	"\tIdentifier\t\"Builtin Default Layout\"\n"
+@@ -259,7 +266,10 @@ xf86AutoConfig(void)
+     for (p = deviceList; *p; p++) {
+ 	snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p);
+ 	AppendToConfig(buf);
+-	snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
++	if( strcmp(*p, "fglrx") == 0 )
++		snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION_FOR_FGLRX, *p, 0, *p, 0);
++	else
++		snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, *p, 0, *p, 0);
+ 	AppendToConfig(buf);
+     }
+ 
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 9020bf7..0e89235 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr  6 18:20:00 CEST 2010 - sndirsch@suse.de
+
+- fix_fglrx_screendepth_issue.patch
+  * hardcode default color depth of fglrx driver to 24bit to fix
+    video driver autoconfiguration (bnc #593878)
+
 -------------------------------------------------------------------
 Fri Apr  2 11:33:28 CEST 2010 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 567b655..919a28b 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -126,6 +126,7 @@ Patch202:       0001-Check-harder-for-primary-PCI-device.patch
 Patch203:       0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
 Patch204:       missing_font_paths.diff
 Patch205:       xorg-server-1.8.0.diff
+Patch206:       fix_fglrx_screendepth_issue.patch
 
 %description
 This package contains the X.Org Server.
@@ -249,6 +250,7 @@ popd
 %patch203 -p1
 %patch204 -p0
 %patch205 -p0
+%patch206 -p0
 
 %build
 pushd xorg-docs-*