diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 4617bb4895..fb31e544c0 100644
--- a/meta/conf/distro/include/preferred-xorg-versions.inc
+++ b/meta/conf/distro/include/preferred-xorg-versions.inc
@@ -26,64 +26,64 @@ PREFERRED_VERSION_kbproto-native ?= "1.0.4"
 PREFERRED_VERSION_kbproto-nativesdk ?= "1.0.4"
 PREFERRED_VERSION_libapplewm ?= "1.0.0"
 PREFERRED_VERSION_libdmx ?= "1.1.0"
-PREFERRED_VERSION_libfontenc ?= "1.0.4"
-PREFERRED_VERSION_libfontenc-native ?= "1.0.4"
+PREFERRED_VERSION_libfontenc ?= "1.0.5"
+PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
 PREFERRED_VERSION_libfs ?= "1.0.1"
-PREFERRED_VERSION_libice ?= "1.0.4"
+PREFERRED_VERSION_libice ?= "1.0.6"
 PREFERRED_VERSION_liblbxutil ?= "1.0.1"
 PREFERRED_VERSION_liboldx ?= "1.0.1"
-PREFERRED_VERSION_libsm ?= "1.1.0"
+PREFERRED_VERSION_libsm ?= "1.1.1"
 PREFERRED_VERSION_libwindowswm ?= "1.0.0"
 PREFERRED_VERSION_libx11 ?= "1.3"
 PREFERRED_VERSION_libx11-diet ?= "1.3"
 PREFERRED_VERSION_libx11-native ?= "1.3"
 PREFERRED_VERSION_libx11-nativesdk ?= "1.3"
 PREFERRED_VERSION_libx11-trim ?= "1.3"
-PREFERRED_VERSION_libxau ?= "1.0.4"
-PREFERRED_VERSION_libxau-native ?= "1.0.4"
-PREFERRED_VERSION_libxau-nativesdk ?= "1.0.4"
+PREFERRED_VERSION_libxau ?= "1.0.5"
+PREFERRED_VERSION_libxau-native ?= "1.0.5"
+PREFERRED_VERSION_libxau-nativesdk ?= "1.0.5"
 PREFERRED_VERSION_libxaw ?= "1.0.5"
-PREFERRED_VERSION_libxcomposite ?= "0.4.0"
-PREFERRED_VERSION_libxcursor ?= "1.1.9"
-PREFERRED_VERSION_libxdamage ?= "1.1.1"
-PREFERRED_VERSION_libxdmcp ?= "1.0.2"
-PREFERRED_VERSION_libxdmcp-native ?= "1.0.2"
-PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.0.2"
+PREFERRED_VERSION_libxcomposite ?= "0.4.1"
+PREFERRED_VERSION_libxcursor ?= "1.1.10"
+PREFERRED_VERSION_libxdamage ?= "1.1.2"
+PREFERRED_VERSION_libxdmcp ?= "1.0.3"
+PREFERRED_VERSION_libxdmcp-native ?= "1.0.3"
+PREFERRED_VERSION_libxdmcp-nativesdk ?= "1.0.3"
 PREFERRED_VERSION_libxevie ?= "1.0.2"
-PREFERRED_VERSION_libxext ?= "1.1.1"
-PREFERRED_VERSION_libxext-nativesdk ?= "1.1.1"
-PREFERRED_VERSION_libxfixes ?= "4.0.3"
-PREFERRED_VERSION_libxfont ?= "1.3.4"
-PREFERRED_VERSION_libxfont-native ?= "1.3.4"
+PREFERRED_VERSION_libxext ?= "1.1.2"
+PREFERRED_VERSION_libxext-nativesdk ?= "1.1.2"
+PREFERRED_VERSION_libxfixes ?= "4.0.4"
+PREFERRED_VERSION_libxfont ?= "1.4.1"
+PREFERRED_VERSION_libxfont-native ?= "1.4.1"
 PREFERRED_VERSION_libxfontcache ?= "1.0.5"
-PREFERRED_VERSION_libxft ?= "2.1.13"
+PREFERRED_VERSION_libxft ?= "2.1.14"
 PREFERRED_VERSION_libxi ?= "1.3"
 PREFERRED_VERSION_libxinerama ?= "1.1"
-PREFERRED_VERSION_libxkbfile ?= "1.0.5"
+PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
-PREFERRED_VERSION_libxmu ?= "1.0.4"
+PREFERRED_VERSION_libxmu ?= "1.0.5"
 PREFERRED_VERSION_libxp ?= "1.0.0"
 PREFERRED_VERSION_libxpm ?= "3.5.7"
 PREFERRED_VERSION_libxprintapputil ?= "1.0.1"
 PREFERRED_VERSION_libxprintutil ?= "1.0.1"
-PREFERRED_VERSION_libxrandr ?= "1.2.99.4"
-PREFERRED_VERSION_libxrandr-nativesdk ?= "1.2.99.4"
-PREFERRED_VERSION_libxrender ?= "0.9.4"
-PREFERRED_VERSION_libxrender-nativesdk ?= "0.9.4"
-PREFERRED_VERSION_libxres ?= "1.0.3"
+PREFERRED_VERSION_libxrandr ?= "1.3.0"
+PREFERRED_VERSION_libxrandr-nativesdk ?= "1.3.0"
+PREFERRED_VERSION_libxrender ?= "0.9.5"
+PREFERRED_VERSION_libxrender-nativesdk ?= "0.9.5"
+PREFERRED_VERSION_libxres ?= "1.0.4"
 PREFERRED_VERSION_libxscrnsaver ?= "1.1.3"
-PREFERRED_VERSION_libxt ?= "1.0.5"
+PREFERRED_VERSION_libxt ?= "1.0.8"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.1.0"
-PREFERRED_VERSION_libxv ?= "1.0.4"
-PREFERRED_VERSION_libxvmc ?= "1.0.4"
+PREFERRED_VERSION_libxv ?= "1.0.5"
+PREFERRED_VERSION_libxvmc ?= "1.0.5"
 PREFERRED_VERSION_libxxf86dga ?= "1.1.1"
-PREFERRED_VERSION_libxxf86misc ?= "1.0.1"
-PREFERRED_VERSION_libxxf86vm ?= "1.0.2"
+PREFERRED_VERSION_libxxf86misc ?= "1.0.2"
+PREFERRED_VERSION_libxxf86vm ?= "1.1.0"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.2"
 PREFERRED_VERSION_makedepend-native ?= "1.0.2"
-PREFERRED_VERSION_pixman ?= "0.17.4"
+PREFERRED_VERSION_pixman ?= "0.18.2"
 PREFERRED_VERSION_printproto ?= "1.0.4"
 PREFERRED_VERSION_randrproto ?= "1.3.1"
 PREFERRED_VERSION_randrproto-nativesdk ?= "1.3.1"
@@ -104,43 +104,43 @@ PREFERRED_VERSION_xcmiscproto-native ?= "1.2.0"
 PREFERRED_VERSION_xcmiscproto-nativesdk ?= "1.2.0"
 PREFERRED_VERSION_xdpyinfo ?= "1.1.0"
 PREFERRED_VERSION_xev ?= "1.0.3"
-PREFERRED_VERSION_xextproto ?= "7.1.0"
-PREFERRED_VERSION_xextproto-native ?= "7.1.0"
-PREFERRED_VERSION_xextproto-nativesdk ?= "7.1.0"
+PREFERRED_VERSION_xextproto ?= "7.1.1"
+PREFERRED_VERSION_xextproto-native ?= "7.1.1"
+PREFERRED_VERSION_xextproto-nativesdk ?= "7.1.1"
 PREFERRED_VERSION_xf86bigfontproto ?= "1.2.0"
 PREFERRED_VERSION_xf86bigfontproto-native ?= "1.2.0"
 PREFERRED_VERSION_xf86bigfontproto-nativesdk ?= "1.2.0"
 PREFERRED_VERSION_xf86dgaproto ?= "2.1"
 PREFERRED_VERSION_xf86driproto ?= "2.1.0"
-PREFERRED_VERSION_dri2proto ?= "2.2"
+PREFERRED_VERSION_dri2proto ?= "2.3"
 PREFERRED_VERSION_xf86miscproto ?= "0.9.3"
 PREFERRED_VERSION_xf86rushproto ?= "1.1.2"
-PREFERRED_VERSION_xf86vidmodeproto ?= "2.2.2"
+PREFERRED_VERSION_xf86vidmodeproto ?= "2.3"
 PREFERRED_VERSION_xhost ?= "1.0.3"
 PREFERRED_VERSION_xinit ?= "1.2.1"
 PREFERRED_VERSION_xineramaproto ?= "1.2"
 PREFERRED_VERSION_xmodmap ?= "1.0.4"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 PREFERRED_VERSION_xprop ?= "1.1.0"
-PREFERRED_VERSION_xproto ?= "7.0.16"
-PREFERRED_VERSION_xproto-native ?= "7.0.16"
-PREFERRED_VERSION_xproto-nativesdk ?= "7.0.16"
+PREFERRED_VERSION_xproto ?= "7.0.17"
+PREFERRED_VERSION_xproto-native ?= "7.0.17"
+PREFERRED_VERSION_xproto-nativesdk ?= "7.0.17"
 PREFERRED_VERSION_xproxymanagementprotocol ?= "1.0.3"
 PREFERRED_VERSION_xrandr ?= "1.2.3"
 PREFERRED_VERSION_xrdb ?= "1.0.5"
 PREFERRED_VERSION_xserver-kdrive ?= "1.7.99.2"
 PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.7.99.2"
 PREFERRED_VERSION_xset ?= "1.1.0"
-PREFERRED_VERSION_xtrans ?= "1.2.2"
-PREFERRED_VERSION_xtrans-native ?= "1.2.2"
-PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.2"
+PREFERRED_VERSION_xtrans ?= "1.2.5"
+PREFERRED_VERSION_xtrans-native ?= "1.2.5"
+PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.5"
 PREFERRED_VERSION_xvinfo ?= "1.0.2"
 PREFERRED_VERSION_xwininfo ?= "1.0.5"
 PREFERRED_VERSION_mesa-dri ?= "7.7"
 PREFERRED_VERSION_libdrm ?= "2.4.21"
-PREFERRED_VERSION_xcb-proto ?= "1.5"
-PREFERRED_VERSION_libxcb ?= "1.3"
-PREFERRED_VERSION_libxcb-nativesdk ?= "1.3"
+PREFERRED_VERSION_xcb-proto ?= "1.6"
+PREFERRED_VERSION_libxcb ?= "1.6"
+PREFERRED_VERSION_libxcb-nativesdk ?= "1.6"
 PREFERRED_VERSION_libpciaccess ?= "0.10.5"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.3.2"
 PREFERRED_VERSION_xf86-input-mouse ?= "1.5.0"