-Patch8: %{name}-broken-includes.patch
-Patch9: %{name}-fhs.patch
-Patch10: %{name}-xdmsecurity.patch
-Patch11: %{name}-xman.patch
-Patch13: %{name}-xdm-fixes.patch
-Patch14: %{name}-pic.patch
-Patch15: %{name}-r128-busmstr2.patch
-Patch16: %{name}-neomagic_swcursor.patch
-Patch17: %{name}-mga-busmstr.patch
-Patch18: %{name}-agpgart-load.patch
-Patch21: %{name}-XTerm.ad.patch
-# no longer needed? to check
-#Patch22: %{name}-xf86Pcih.patch
-Patch23: %{name}-dontbuildfonts.patch
-Patch25: %{name}-llh.patch
-Patch32: XFree86-xman-manpaths.patch
-Patch33: XFree86-clearrts.patch
-# tdfx-fix-vtswitch-font-corruption - not applied, needs check
-Patch40: XFree86-Xfont-Type1-large-DoS.patch
-Patch41: %{name}-GLcore-strip-a-workaround.patch
-Patch44: %{name}-pkgconfig.patch
-Patch45: XFree86-spencode-nowarning.patch
-Patch46: XFree86-lock.patch
-Patch50: %{name}-xterm-256colors.patch
-Patch54: %{name}-setxkbmap.patch
-Patch55: %{name}-makefile-fastbuild.patch
+Patch7: %{name}-broken-includes.patch
+Patch8: %{name}-fhs.patch
+Patch9: %{name}-xdmsecurity.patch
+Patch10: %{name}-xman.patch
+Patch11: %{name}-xdm-fixes.patch
+Patch12: %{name}-pic.patch
+Patch13: %{name}-r128-busmstr2.patch
+Patch14: %{name}-neomagic_swcursor.patch
+Patch15: %{name}-mga-busmstr.patch
+Patch16: %{name}-agpgart-load.patch
+Patch17: %{name}-XTerm.ad.patch
+Patch18: %{name}-dontbuildfonts.patch
+Patch19: %{name}-llh.patch
+Patch20: XFree86-xman-manpaths.patch
+Patch21: XFree86-clearrts.patch
+Patch22: XFree86-Xfont-Type1-large-DoS.patch
+Patch23: %{name}-GLcore-strip-a-workaround.patch
+Patch24: %{name}-pkgconfig.patch
+Patch25: XFree86-spencode-nowarning.patch
+Patch26: %{name}-xterm-256colors.patch
+Patch27: %{name}-makefile-fastbuild.patch