diff --git a/dga-removal-fix.diff b/dga-removal-fix.diff
index 2a05f6f..6fda08c 100644
--- a/dga-removal-fix.diff
+++ b/dga-removal-fix.diff
@@ -62,7 +62,7 @@ index 42b7c58..804fd37 100644
  }
  
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index c1e31e0..f274725 100644
+index c1e31e0..506fbb9 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
 @@ -806,7 +806,7 @@ xf86CrtcScreenInit (ScreenPtr screen)
@@ -70,7 +70,7 @@ index c1e31e0..f274725 100644
      
  #ifdef XFreeXDGA
 -    xf86DiDGAInit(screen, 0);
-+    _xf86_di_dga_init_for_reals(screen);
++    _xf86_di_dga_init_internal(screen);
  #endif
  #ifdef RANDR_13_INTERFACE
      return RANDR_INTERFACE_VERSION;
@@ -79,12 +79,12 @@ index c1e31e0..f274725 100644
  #ifdef XFreeXDGA
      if (scrn->pScreen)
 -	    xf86DiDGAReInit(scrn->pScreen);
-+	    _xf86_di_dga_reinit_for_reals(scrn->pScreen);
++	    _xf86_di_dga_reinit_internal(scrn->pScreen);
  #endif
  }
  
 diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
-index 69afaa5..edf84d8 100644
+index 69afaa5..9baa956 100644
 --- a/hw/xfree86/modes/xf86Crtc.h
 +++ b/hw/xfree86/modes/xf86Crtc.h
 @@ -833,6 +833,10 @@ xf86OutputGetEDID (xf86OutputPtr output, I2CBusPtr pDDCBus);
@@ -93,7 +93,7 @@ index 69afaa5..edf84d8 100644
  
 +/* this is the real function, used only internally */
 +_X_INTERNAL Bool
-+_xf86_di_dga_init_for_reals (ScreenPtr pScreen);
++_xf86_di_dga_init_internal (ScreenPtr pScreen);
 +
  /**
   * Re-initialize dga for this screen (as when the set of modes changes)
@@ -104,13 +104,13 @@ index 69afaa5..edf84d8 100644
  
 +/* This is the real function, used only internally */
 +_X_INTERNAL Bool
-+_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen);
++_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
 +
  /*
   * Set the subpixel order reported for the screen using
   * the information from the outputs
 diff --git a/hw/xfree86/modes/xf86DiDGA.c b/hw/xfree86/modes/xf86DiDGA.c
-index 0f7b834..3df3754 100644
+index 0f7b834..60fbdbf 100644
 --- a/hw/xfree86/modes/xf86DiDGA.c
 +++ b/hw/xfree86/modes/xf86DiDGA.c
 @@ -175,6 +175,12 @@ static DGAFunctionRec xf86_dga_funcs = {
@@ -120,8 +120,8 @@ index 0f7b834..3df3754 100644
 +    return TRUE;
 +}
 +
-+_X_INTERNAL Bool
-+_xf86_di_dga_reinit_for_reals (ScreenPtr pScreen)
++Bool
++_xf86_di_dga_reinit_internal (ScreenPtr pScreen)
 +{
      ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
      xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -133,8 +133,8 @@ index 0f7b834..3df3754 100644
 +    return TRUE;
 +}
 +
-+_X_INTERNAL Bool
-+_xf86_di_dga_init_for_reals (ScreenPtr pScreen)
++Bool
++_xf86_di_dga_init_internal (ScreenPtr pScreen)
 +{
      ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];
      xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 2e4f425..b0e73b2 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Oct  1 02:50:16 CEST 2009 - sndirsch@suse.de
+
+- dga-removal-fix.diff
+  * Here's an updated patch -- removes the _X_INTERNAL from the .c
+    files, renames xf86DiDGAInit to _xf86_di_dga_init_internal,
+    and renames xf86DiDGAReInit to _xf86_di_dga_reinit_internal.
+
 -------------------------------------------------------------------
 Tue Sep 29 19:43:23 CEST 2009 - sndirsch@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index db72788..f6cb072 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -33,7 +33,7 @@ BuildRequires:  libjpeg-devel
 Url:            http://xorg.freedesktop.org/
 %define EXPERIMENTAL 0
 Version:        7.4
-Release:        56
+Release:        57
 License:        GPL v2 or later ; MIT License (or similar)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Group:          System/X11/Servers/XF86_4