diff --git a/u_dri2_add_DRI2CreateDrawable2.patch b/U_dri2_add_DRI2CreateDrawable2.patch
similarity index 100%
rename from u_dri2_add_DRI2CreateDrawable2.patch
rename to U_dri2_add_DRI2CreateDrawable2.patch
diff --git a/u_0012-glx_Free_reference_to_destroyed_GLX_drawable.patch b/U_glx_Free_reference_to_destroyed_GLX_drawable.patch
similarity index 100%
rename from u_0012-glx_Free_reference_to_destroyed_GLX_drawable.patch
rename to U_glx_Free_reference_to_destroyed_GLX_drawable.patch
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index afbbaf3..6ece550 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 17 01:42:30 UTC 2012 - sndirsch@suse.com
+
+- renamed patches of previous change according to our policy
+  u_* --> U_* (since these were rebased on upstream patches) 
+
 -------------------------------------------------------------------
 Fri Jul 13 00:19:59 UTC 2012 - badshah400@gmail.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index fec47e8..12bf0b0 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -184,6 +184,8 @@ Patch213:       xorg-server-xdmcp.patch
 Patch220:       Use-external-tool-for-creating-backtraces-on-crashes.patch
 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
 Patch222:       sync-fix.patch
+Patch223:       U_glx_Free_reference_to_destroyed_GLX_drawable.patch
+Patch224:       U_dri2_add_DRI2CreateDrawable2.patch
 # Patches to implement GLX_ARB_create_context extensions required for OpenGL 3.0 support
 # http://lists.x.org/archives/xorg-devel/2012-April/030452.html
 # git://people.freedesktop.org/~idr/xserver.git
@@ -198,8 +200,6 @@ Patch307:       u_0008-glx-Initialize-remaining-context-fields.patch
 Patch308:       u_0009-glx-Use-one-function-to-add-a-context-to-all-global-.patch
 Patch309:       u_0010-glx-Make-several-functions-available-outside-the-glx.patch
 Patch310:       u_0011-glx-Implement-protocol-for-glXCreateContextAttribsAR.patch
-Patch311:       u_0012-glx_Free_reference_to_destroyed_GLX_drawable.patch
-Patch400:       u_dri2_add_DRI2CreateDrawable2.patch
 
 %description
 This package contains the X.Org Server.
@@ -322,6 +322,8 @@ cp %{SOURCE96} .
 ### Disable backtrace generation patch for now
 #%patch220 -p1
 %patch222 -p1
+%patch223 -p1
+%patch224 -p1
 %patch300 -p1
 %patch301 -p1
 %patch302 -p1
@@ -333,8 +335,6 @@ cp %{SOURCE96} .
 %patch308 -p1
 %patch309 -p1
 %patch310 -p1
-%patch311 -p1
-%patch400 -p1
 
 %build
 autoreconf -fi