* xorg: Update to Xorg 7.3. Add new dependencies libxcb and

pixman. Update all packages to the corresponding versions. git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7540 33e552b5-05e3-0310-8538-816dae2090ed
author: Michael Olbrich <m.olbrich@pengutronix.de> 2007-10-19 14:08:00 +0000
committer: Michael Olbrich <m.olbrich@pengutronix.de> 2007-10-19 14:08:00 +0000
commit: ac648c7bac43a5cefff95edfd20880c459f52edf (patch)
tree: 8b7f9dfb0e612a6771162a3670c3be461f52d807 /rules
parent: 3276365c54fb7e8e3fd2cc0eb4f128c90cb11962 (diff)
download: ptxdist-ac648c7bac43a5cefff95edfd20880c459f52edf.tar.gz
ptxdist-ac648c7bac43a5cefff95edfd20880c459f52edf.tar.xz
161 files changed, 1283 insertions, 352 deletions
diff --git a/rules/host-libpthread-stubs.in b/rules/host-libpthread-stubs.in
new file mode 100644
index 000000000..6ada36172
--- /dev/null
+++ b/rules/host-libpthread-stubs.in
@@ -0,0 +1,2 @@
+config HOST_LIBPTHREAD_STUBS
+	bool
diff --git a/rules/host-libpthread-stubs.make b/rules/host-libpthread-stubs.make
new file mode 100644
index 000000000..88ef4426a
--- /dev/null
+++ b/rules/host-libpthread-stubs.make
@@ -0,0 +1,97 @@
+# -*-makefile-*-
+# $Id$
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBPTHREAD_STUBS) += host-libpthread-stubs
+
+#
+# Paths and names
+#
+HOST_LIBPTHREAD_STUBS_DIR	= $(HOST_BUILDDIR)/$(LIBPTHREAD_STUBS)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+host-libpthread-stubs_get: $(STATEDIR)/host-libpthread-stubs.get
+
+$(STATEDIR)/host-libpthread-stubs.get: $(STATEDIR)/libpthread-stubs.get
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+host-libpthread-stubs_extract: $(STATEDIR)/host-libpthread-stubs.extract
+
+$(STATEDIR)/host-libpthread-stubs.extract: $(host-libpthread-stubs_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_LIBPTHREAD_STUBS_DIR))
+	@$(call extract, LIBPTHREAD_STUBS, $(HOST_BUILDDIR))
+	@$(call patchin, LIBPTHREAD_STUBS, $(HOST_LIBPTHREAD_STUBS_DIR))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+host-libpthread-stubs_prepare: $(STATEDIR)/host-libpthread-stubs.prepare
+
+HOST_LIBPTHREAD_STUBS_PATH	:= PATH=$(HOST_PATH)
+HOST_LIBPTHREAD_STUBS_ENV 	:= $(HOST_ENV)
+
+#
+# autoconf
+#
+HOST_LIBPTHREAD_STUBS_AUTOCONF	:= $(HOST_AUTOCONF)
+
+$(STATEDIR)/host-libpthread-stubs.prepare: $(host-libpthread-stubs_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_LIBPTHREAD_STUBS_DIR)/config.cache)
+	cd $(HOST_LIBPTHREAD_STUBS_DIR) && \
+		$(HOST_LIBPTHREAD_STUBS_PATH) $(HOST_LIBPTHREAD_STUBS_ENV) \
+		./configure $(HOST_LIBPTHREAD_STUBS_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+host-libpthread-stubs_compile: $(STATEDIR)/host-libpthread-stubs.compile
+
+$(STATEDIR)/host-libpthread-stubs.compile: $(host-libpthread-stubs_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(HOST_LIBPTHREAD_STUBS_DIR) && $(HOST_LIBPTHREAD_STUBS_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+host-libpthread-stubs_install: $(STATEDIR)/host-libpthread-stubs.install
+
+$(STATEDIR)/host-libpthread-stubs.install: $(host-libpthread-stubs_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, HOST_LIBPTHREAD_STUBS,,h)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+host-libpthread-stubs_clean:
+	rm -rf $(STATEDIR)/host-libpthread-stubs.*
+	rm -rf $(HOST_LIBPTHREAD_STUBS_DIR)
+
+# vim: syntax=make
diff --git a/rules/host-libxcb.in b/rules/host-libxcb.in
new file mode 100644
index 000000000..c2a0650ee
--- /dev/null
+++ b/rules/host-libxcb.in
@@ -0,0 +1,7 @@
+config HOST_LIBXCB
+	bool
+	select HOST_XCB_PROTO
+	select HOST_LIBXSLT
+	select HOST_LIBXSLT_XSLTPROC
+	select HOST_LIBPTHREAD_STUBS
+	select HOST_XORG_LIB_XAU
diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make
new file mode 100644
index 000000000..63c1cee7d
--- /dev/null
+++ b/rules/host-libxcb.make
@@ -0,0 +1,99 @@
+# -*-makefile-*-
+# $Id$
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_LIBXCB) += host-libxcb
+
+#
+# Paths and names
+#
+HOST_LIBXCB_DIR	= $(HOST_BUILDDIR)/$(LIBXCB)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+host-libxcb_get: $(STATEDIR)/host-libxcb.get
+
+$(STATEDIR)/host-libxcb.get: $(STATEDIR)/libxcb.get
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+host-libxcb_extract: $(STATEDIR)/host-libxcb.extract
+
+$(STATEDIR)/host-libxcb.extract: $(host-libxcb_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_LIBXCB_DIR))
+	@$(call extract, LIBXCB, $(HOST_BUILDDIR))
+	@$(call patchin, LIBXCB, $(HOST_LIBXCB_DIR))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+host-libxcb_prepare: $(STATEDIR)/host-libxcb.prepare
+
+HOST_LIBXCB_PATH	:= PATH=$(HOST_PATH)
+HOST_LIBXCB_ENV 	:= $(HOST_ENV)
+
+#
+# autoconf
+#
+HOST_LIBXCB_AUTOCONF	:= \
+	$(HOST_AUTOCONF) \
+	--disable-build-docs
+
+$(STATEDIR)/host-libxcb.prepare: $(host-libxcb_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_LIBXCB_DIR)/config.cache)
+	cd $(HOST_LIBXCB_DIR) && \
+		$(HOST_LIBXCB_PATH) $(HOST_LIBXCB_ENV) \
+		./configure $(HOST_LIBXCB_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+host-libxcb_compile: $(STATEDIR)/host-libxcb.compile
+
+$(STATEDIR)/host-libxcb.compile: $(host-libxcb_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(HOST_LIBXCB_DIR) && $(HOST_LIBXCB_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+host-libxcb_install: $(STATEDIR)/host-libxcb.install
+
+$(STATEDIR)/host-libxcb.install: $(host-libxcb_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, HOST_LIBXCB,,h)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+host-libxcb_clean:
+	rm -rf $(STATEDIR)/host-libxcb.*
+	rm -rf $(HOST_LIBXCB_DIR)
+
+# vim: syntax=make
diff --git a/rules/host-xcb-proto.in b/rules/host-xcb-proto.in
new file mode 100644
index 000000000..e70b0ec93
--- /dev/null
+++ b/rules/host-xcb-proto.in
@@ -0,0 +1,2 @@
+config HOST_XCB_PROTO
+	bool
diff --git a/rules/host-xcb-proto.make b/rules/host-xcb-proto.make
new file mode 100644
index 000000000..ea7534e0e
--- /dev/null
+++ b/rules/host-xcb-proto.make
@@ -0,0 +1,97 @@
+# -*-makefile-*-
+# $Id$
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+HOST_PACKAGES-$(PTXCONF_HOST_XCB_PROTO) += host-xcb-proto
+
+#
+# Paths and names
+#
+HOST_XCB_PROTO_DIR	= $(HOST_BUILDDIR)/$(XCB_PROTO)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+host-xcb-proto_get: $(STATEDIR)/host-xcb-proto.get
+
+$(STATEDIR)/host-xcb-proto.get: $(STATEDIR)/xcb-proto.get
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+host-xcb-proto_extract: $(STATEDIR)/host-xcb-proto.extract
+
+$(STATEDIR)/host-xcb-proto.extract: $(host-xcb-proto_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_XCB_PROTO_DIR))
+	@$(call extract, XCB_PROTO, $(HOST_BUILDDIR))
+	@$(call patchin, XCB_PROTO, $(HOST_XCB_PROTO_DIR))
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+host-xcb-proto_prepare: $(STATEDIR)/host-xcb-proto.prepare
+
+HOST_XCB_PROTO_PATH	:= PATH=$(HOST_PATH)
+HOST_XCB_PROTO_ENV 	:= $(HOST_ENV)
+
+#
+# autoconf
+#
+HOST_XCB_PROTO_AUTOCONF	:= $(HOST_AUTOCONF)
+
+$(STATEDIR)/host-xcb-proto.prepare: $(host-xcb-proto_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(HOST_XCB_PROTO_DIR)/config.cache)
+	cd $(HOST_XCB_PROTO_DIR) && \
+		$(HOST_XCB_PROTO_PATH) $(HOST_XCB_PROTO_ENV) \
+		./configure $(HOST_XCB_PROTO_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+host-xcb-proto_compile: $(STATEDIR)/host-xcb-proto.compile
+
+$(STATEDIR)/host-xcb-proto.compile: $(host-xcb-proto_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(HOST_XCB_PROTO_DIR) && $(HOST_XCB_PROTO_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+host-xcb-proto_install: $(STATEDIR)/host-xcb-proto.install
+
+$(STATEDIR)/host-xcb-proto.install: $(host-xcb-proto_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, HOST_XCB_PROTO,,h)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+host-xcb-proto_clean:
+	rm -rf $(STATEDIR)/host-xcb-proto.*
+	rm -rf $(HOST_XCB_PROTO_DIR)
+
+# vim: syntax=make
diff --git a/rules/host-xorg-lib-X11.in b/rules/host-xorg-lib-X11.in
index 9d1cd778a..e917cc17a 100644
--- a/rules/host-xorg-lib-X11.in
+++ b/rules/host-xorg-lib-X11.in
@@ -2,6 +2,7 @@ config HOST_XORG_LIB_X11
 	bool
 	select HOST_XORG_PROTO_X
 
+	select HOST_LIBXCB
 	select HOST_XORG_PROTO_XEXT
 	select HOST_XORG_LIB_XTRANS
 	select HOST_XORG_LIB_XAU
diff --git a/rules/hosttools.in b/rules/hosttools.in
index cfaa7c9ab..81f07f961 100644
--- a/rules/hosttools.in
+++ b/rules/hosttools.in
@@ -44,6 +44,7 @@ source "rules/host-localedef.in"
 source "rules/host-fontconfig.in"
 source "rules/host-libxml2.in"
 source "rules/host-libxslt.in"
+source "rules/host-libpthread-stubs.in"
 
 comment "------------------------------"
 comment "Scripting Languages           "
@@ -62,6 +63,8 @@ source "rules/host-mysql.in"
 source "rules/host-zlib.in"
 source "rules/host-mtd-utils.in"
 source "rules/host-pkg-config.in"
+source "rules/host-xcb-proto.in"
+source "rules/host-libxcb.in"
 source "rules/host-xorg-app-bdftopcf.in"
 source "rules/host-xorg-app-mkfontdir.in"
 source "rules/host-xorg-app-mkfontscale.in"
diff --git a/rules/libiconv.make b/rules/libiconv.make
index b01716d3f..c190c2562 100644
--- a/rules/libiconv.make
+++ b/rules/libiconv.make
@@ -63,7 +63,8 @@ LIBICONV_ENV 	:=  $(CROSS_ENV)
 #
 # autoconf
 #
-LIBICONV_AUTOCONF := $(CROSS_AUTOCONF_USR)
+LIBICONV_AUTOCONF := $(CROSS_AUTOCONF_USR) \
+	--enable-static
 
 ifdef PTXCONF_LIBICONV_EXTRA_ENCODINGS
 	LIBICONV_AUTOCONF += --enable-extra-encodings
diff --git a/rules/libpthread-stubs.in b/rules/libpthread-stubs.in
new file mode 100644
index 000000000..05b429ba5
--- /dev/null
+++ b/rules/libpthread-stubs.in
@@ -0,0 +1,2 @@
+config LIBPTHREAD_STUBS
+	bool
diff --git a/rules/libpthread-stubs.make b/rules/libpthread-stubs.make
new file mode 100644
index 000000000..a85b44705
--- /dev/null
+++ b/rules/libpthread-stubs.make
@@ -0,0 +1,129 @@
+# -*-makefile-*-
+# $Id: template 6655 2007-01-02 12:55:21Z rsc $
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBPTHREAD_STUBS) += libpthread-stubs
+
+#
+# Paths and names
+#
+LIBPTHREAD_STUBS_VERSION	:= 0.1
+LIBPTHREAD_STUBS		:= libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION)
+LIBPTHREAD_STUBS_SUFFIX		:= tar.bz2
+LIBPTHREAD_STUBS_URL		:= http://xcb.freedesktop.org/dist/$(LIBPTHREAD_STUBS).$(LIBPTHREAD_STUBS_SUFFIX)
+LIBPTHREAD_STUBS_SOURCE		:= $(SRCDIR)/$(LIBPTHREAD_STUBS).$(LIBPTHREAD_STUBS_SUFFIX)
+LIBPTHREAD_STUBS_DIR		:= $(BUILDDIR)/$(LIBPTHREAD_STUBS)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_get: $(STATEDIR)/libpthread-stubs.get
+
+$(STATEDIR)/libpthread-stubs.get: $(libpthread-stubs_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(LIBPTHREAD_STUBS_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, LIBPTHREAD_STUBS)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_extract: $(STATEDIR)/libpthread-stubs.extract
+
+$(STATEDIR)/libpthread-stubs.extract: $(libpthread-stubs_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LIBPTHREAD_STUBS_DIR))
+	@$(call extract, LIBPTHREAD_STUBS)
+	@$(call patchin, LIBPTHREAD_STUBS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_prepare: $(STATEDIR)/libpthread-stubs.prepare
+
+LIBPTHREAD_STUBS_PATH	:= PATH=$(CROSS_PATH)
+LIBPTHREAD_STUBS_ENV 	:= $(CROSS_ENV)
+
+#
+# autoconf
+#
+LIBPTHREAD_STUBS_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/libpthread-stubs.prepare: $(libpthread-stubs_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LIBPTHREAD_STUBS_DIR)/config.cache)
+	cd $(LIBPTHREAD_STUBS_DIR) && \
+		$(LIBPTHREAD_STUBS_PATH) $(LIBPTHREAD_STUBS_ENV) \
+		./configure $(LIBPTHREAD_STUBS_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_compile: $(STATEDIR)/libpthread-stubs.compile
+
+$(STATEDIR)/libpthread-stubs.compile: $(libpthread-stubs_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(LIBPTHREAD_STUBS_DIR) && $(LIBPTHREAD_STUBS_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_install: $(STATEDIR)/libpthread-stubs.install
+
+$(STATEDIR)/libpthread-stubs.install: $(libpthread-stubs_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, LIBPTHREAD_STUBS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_targetinstall: $(STATEDIR)/libpthread-stubs.targetinstall
+
+$(STATEDIR)/libpthread-stubs.targetinstall: $(libpthread-stubs_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, libpthread-stubs)
+	@$(call install_fixup, libpthread-stubs,PACKAGE,libpthread-stubs)
+	@$(call install_fixup, libpthread-stubs,PRIORITY,optional)
+	@$(call install_fixup, libpthread-stubs,VERSION,$(LIBPTHREAD_STUBS_VERSION))
+	@$(call install_fixup, libpthread-stubs,SECTION,base)
+	@$(call install_fixup, libpthread-stubs,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libpthread-stubs,DEPENDS,)
+	@$(call install_fixup, libpthread-stubs,DESCRIPTION,missing)
+
+	@$(call install_finish, libpthread-stubs)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+libpthread-stubs_clean:
+	rm -rf $(STATEDIR)/libpthread-stubs.*
+	rm -rf $(IMAGEDIR)/libpthread-stubs_*
+	rm -rf $(LIBPTHREAD_STUBS_DIR)
+
+# vim: syntax=make
diff --git a/rules/libxcb.in b/rules/libxcb.in
new file mode 100644
index 000000000..473747cb8
--- /dev/null
+++ b/rules/libxcb.in
@@ -0,0 +1,12 @@
+config LIBXCB
+	bool
+	prompt "libxcb"
+	select XCB_PROTO
+	select LIBXSLT
+	select LIBXSLT_XSLTPROC
+	select LIBPTHREAD_STUBS
+	select XORG_LIB_XAU
+	help
+	  The X protocol C-language Binding (XCB) is a replacement for Xlib
+	  featuring a small footprint, latency hiding, direct access to the
+	  protocol, improved threading support, and extensibility.
diff --git a/rules/libxcb.make b/rules/libxcb.make
new file mode 100644
index 000000000..2384a8f10
--- /dev/null
+++ b/rules/libxcb.make
@@ -0,0 +1,198 @@
+# -*-makefile-*-
+# $Id: template 6655 2007-01-02 12:55:21Z rsc $
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBXCB) += libxcb
+
+#
+# Paths and names
+#
+LIBXCB_VERSION		:= 1.0
+LIBXCB			:= libxcb-$(LIBXCB_VERSION)
+LIBXCB_SUFFIX		:= tar.bz2
+LIBXCB_URL		:= http://xcb.freedesktop.org/dist/$(LIBXCB).$(LIBXCB_SUFFIX)
+LIBXCB_SOURCE		:= $(SRCDIR)/$(LIBXCB).$(LIBXCB_SUFFIX)
+LIBXCB_DIR		:= $(BUILDDIR)/$(LIBXCB)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+libxcb_get: $(STATEDIR)/libxcb.get
+
+$(STATEDIR)/libxcb.get: $(libxcb_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(LIBXCB_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, LIBXCB)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+libxcb_extract: $(STATEDIR)/libxcb.extract
+
+$(STATEDIR)/libxcb.extract: $(libxcb_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LIBXCB_DIR))
+	@$(call extract, LIBXCB)
+	@$(call patchin, LIBXCB)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+libxcb_prepare: $(STATEDIR)/libxcb.prepare
+
+LIBXCB_PATH	:= PATH=$(CROSS_PATH)
+LIBXCB_ENV 	:= $(CROSS_ENV)
+
+#
+# autoconf
+#
+LIBXCB_AUTOCONF := \
+	$(CROSS_AUTOCONF_USR) \
+	--disable-build-docs
+
+$(STATEDIR)/libxcb.prepare: $(libxcb_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(LIBXCB_DIR)/config.cache)
+	cd $(LIBXCB_DIR) && \
+		$(LIBXCB_PATH) $(LIBXCB_ENV) \
+		./configure $(LIBXCB_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+libxcb_compile: $(STATEDIR)/libxcb.compile
+
+$(STATEDIR)/libxcb.compile: $(libxcb_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(LIBXCB_DIR) && $(LIBXCB_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+libxcb_install: $(STATEDIR)/libxcb.install
+
+$(STATEDIR)/libxcb.install: $(libxcb_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, LIBXCB)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+libxcb_targetinstall: $(STATEDIR)/libxcb.targetinstall
+
+$(STATEDIR)/libxcb.targetinstall: $(libxcb_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, libxcb)
+	@$(call install_fixup, libxcb,PACKAGE,libxcb)
+	@$(call install_fixup, libxcb,PRIORITY,optional)
+	@$(call install_fixup, libxcb,VERSION,$(LIBXCB_VERSION))
+	@$(call install_fixup, libxcb,SECTION,base)
+	@$(call install_fixup, libxcb,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, libxcb,DEPENDS,)
+	@$(call install_fixup, libxcb,DESCRIPTION,missing)
+
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-composite.so.0.0.0, /usr/lib/libxcb-composite.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-composite.so.0.0.0, /usr/lib/libxcb-composite.so.0)
+	@$(call install_link, libxcb, libxcb-composite.so.0.0.0, /usr/lib/libxcb-composite.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-damage.so.0.0.0, /usr/lib/libxcb-damage.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-damage.so.0.0.0, /usr/lib/libxcb-damage.so.0)
+	@$(call install_link, libxcb, libxcb-damage.so.0.0.0, /usr/lib/libxcb-damage.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-dpms.so.0.0.0, /usr/lib/libxcb-dpms.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-dpms.so.0.0.0, /usr/lib/libxcb-dpms.so.0)
+	@$(call install_link, libxcb, libxcb-dpms.so.0.0.0, /usr/lib/libxcb-dpms.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-glx.so.0.0.0, /usr/lib/libxcb-glx.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-glx.so.0.0.0, /usr/lib/libxcb-glx.so.0)
+	@$(call install_link, libxcb, libxcb-glx.so.0.0.0, /usr/lib/libxcb-glx.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-randr.so.0.0.0, /usr/lib/libxcb-randr.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-randr.so.0.0.0, /usr/lib/libxcb-randr.so.0)
+	@$(call install_link, libxcb, libxcb-randr.so.0.0.0, /usr/lib/libxcb-randr.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-record.so.0.0.0, /usr/lib/libxcb-record.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-record.so.0.0.0, /usr/lib/libxcb-record.so.0)
+	@$(call install_link, libxcb, libxcb-record.so.0.0.0, /usr/lib/libxcb-record.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-render.so.0.0.0, /usr/lib/libxcb-render.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-render.so.0.0.0, /usr/lib/libxcb-render.so.0)
+	@$(call install_link, libxcb, libxcb-render.so.0.0.0, /usr/lib/libxcb-render.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-res.so.0.0.0, /usr/lib/libxcb-res.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-res.so.0.0.0, /usr/lib/libxcb-res.so.0)
+	@$(call install_link, libxcb, libxcb-res.so.0.0.0, /usr/lib/libxcb-res.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-screensaver.so.0.0.0, /usr/lib/libxcb-screensaver.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-screensaver.so.0.0.0, /usr/lib/libxcb-screensaver.so.0)
+	@$(call install_link, libxcb, libxcb-screensaver.so.0.0.0, /usr/lib/libxcb-screensaver.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-shape.so.0.0.0, /usr/lib/libxcb-shape.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-shape.so.0.0.0, /usr/lib/libxcb-shape.so.0)
+	@$(call install_link, libxcb, libxcb-shape.so.0.0.0, /usr/lib/libxcb-shape.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-shm.so.0.0.0, /usr/lib/libxcb-shm.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-shm.so.0.0.0, /usr/lib/libxcb-shm.so.0)
+	@$(call install_link, libxcb, libxcb-shm.so.0.0.0, /usr/lib/libxcb-shm.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-sync.so.0.0.0, /usr/lib/libxcb-sync.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-sync.so.0.0.0, /usr/lib/libxcb-sync.so.0)
+	@$(call install_link, libxcb, libxcb-sync.so.0.0.0, /usr/lib/libxcb-sync.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xevie.so.0.0.0, /usr/lib/libxcb-xevie.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xevie.so.0.0.0, /usr/lib/libxcb-xevie.so.0)
+	@$(call install_link, libxcb, libxcb-xevie.so.0.0.0, /usr/lib/libxcb-xevie.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xf86dri.so.0.0.0, /usr/lib/libxcb-xf86dri.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xf86dri.so.0.0.0, /usr/lib/libxcb-xf86dri.so.0)
+	@$(call install_link, libxcb, libxcb-xf86dri.so.0.0.0, /usr/lib/libxcb-xf86dri.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xfixes.so.0.0.0, /usr/lib/libxcb-xfixes.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xfixes.so.0.0.0, /usr/lib/libxcb-xfixes.so.0)
+	@$(call install_link, libxcb, libxcb-xfixes.so.0.0.0, /usr/lib/libxcb-xfixes.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xinerama.so.0.0.0, /usr/lib/libxcb-xinerama.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xinerama.so.0.0.0, /usr/lib/libxcb-xinerama.so.0)
+	@$(call install_link, libxcb, libxcb-xinerama.so.0.0.0, /usr/lib/libxcb-xinerama.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xlib.so.0.0.0, /usr/lib/libxcb-xlib.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xlib.so.0.0.0, /usr/lib/libxcb-xlib.so.0)
+	@$(call install_link, libxcb, libxcb-xlib.so.0.0.0, /usr/lib/libxcb-xlib.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xprint.so.0.0.0, /usr/lib/libxcb-xprint.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xprint.so.0.0.0, /usr/lib/libxcb-xprint.so.0)
+	@$(call install_link, libxcb, libxcb-xprint.so.0.0.0, /usr/lib/libxcb-xprint.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xtest.so.0.0.0, /usr/lib/libxcb-xtest.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xtest.so.0.0.0, /usr/lib/libxcb-xtest.so.0)
+	@$(call install_link, libxcb, libxcb-xtest.so.0.0.0, /usr/lib/libxcb-xtest.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xv.so.0.0.0, /usr/lib/libxcb-xv.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xv.so.0.0.0, /usr/lib/libxcb-xv.so.0)
+	@$(call install_link, libxcb, libxcb-xv.so.0.0.0, /usr/lib/libxcb-xv.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb-xvmc.so.0.0.0, /usr/lib/libxcb-xvmc.so.0.0.0)
+	@$(call install_link, libxcb, libxcb-xvmc.so.0.0.0, /usr/lib/libxcb-xvmc.so.0)
+	@$(call install_link, libxcb, libxcb-xvmc.so.0.0.0, /usr/lib/libxcb-xvmc.so)
+	@$(call install_copy, libxcb, 0, 0, 0644, $(LIBXCB_DIR)/src/.libs/libxcb.so.1.0.0, /usr/lib/libxcb.so.1.0.0)
+	@$(call install_link, libxcb, libxcb.so.1.0.0, /usr/lib/libxcb.so.1)
+	@$(call install_link, libxcb, libxcb.so.1.0.0, /usr/lib/libxcb.so)
+
+	@$(call install_finish, libxcb)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+libxcb_clean:
+	rm -rf $(STATEDIR)/libxcb.*
+	rm -rf $(IMAGEDIR)/libxcb_*
+	rm -rf $(LIBXCB_DIR)
+
+# vim: syntax=make
diff --git a/rules/pixman.in b/rules/pixman.in
new file mode 100644
index 000000000..30d17c366
--- /dev/null
+++ b/rules/pixman.in
@@ -0,0 +1,6 @@
+config PIXMAN
+	bool
+	prompt "pixman"
+	help
+	  Pixman contains lowlevel pixel manipulation routines and is used by
+	  both xorg and cairo.
diff --git a/rules/pixman.make b/rules/pixman.make
new file mode 100644
index 000000000..d8e8618a6
--- /dev/null
+++ b/rules/pixman.make
@@ -0,0 +1,133 @@
+# -*-makefile-*-
+# $Id: template 6655 2007-01-02 12:55:21Z rsc $
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_PIXMAN) += pixman
+
+#
+# Paths and names
+#
+PIXMAN_VERSION	:= 0.9.5
+PIXMAN		:= pixman-$(PIXMAN_VERSION)
+PIXMAN_SUFFIX		:= tar.bz2
+PIXMAN_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/individual/lib//$(PIXMAN).$(PIXMAN_SUFFIX)
+PIXMAN_SOURCE		:= $(SRCDIR)/$(PIXMAN).$(PIXMAN_SUFFIX)
+PIXMAN_DIR		:= $(BUILDDIR)/$(PIXMAN)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+pixman_get: $(STATEDIR)/pixman.get
+
+$(STATEDIR)/pixman.get: $(pixman_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(PIXMAN_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, PIXMAN)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+pixman_extract: $(STATEDIR)/pixman.extract
+
+$(STATEDIR)/pixman.extract: $(pixman_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(PIXMAN_DIR))
+	@$(call extract, PIXMAN)
+	@$(call patchin, PIXMAN)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+pixman_prepare: $(STATEDIR)/pixman.prepare
+
+PIXMAN_PATH	:= PATH=$(CROSS_PATH)
+PIXMAN_ENV 	:= $(CROSS_ENV)
+
+#
+# autoconf
+#
+PIXMAN_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/pixman.prepare: $(pixman_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(PIXMAN_DIR)/config.cache)
+	cd $(PIXMAN_DIR) && \
+		$(PIXMAN_PATH) $(PIXMAN_ENV) \
+		./configure $(PIXMAN_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+pixman_compile: $(STATEDIR)/pixman.compile
+
+$(STATEDIR)/pixman.compile: $(pixman_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(PIXMAN_DIR) && $(PIXMAN_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+pixman_install: $(STATEDIR)/pixman.install
+
+$(STATEDIR)/pixman.install: $(pixman_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, PIXMAN)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+pixman_targetinstall: $(STATEDIR)/pixman.targetinstall
+
+$(STATEDIR)/pixman.targetinstall: $(pixman_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, pixman)
+	@$(call install_fixup, pixman,PACKAGE,pixman)
+	@$(call install_fixup, pixman,PRIORITY,optional)
+	@$(call install_fixup, pixman,VERSION,$(PIXMAN_VERSION))
+	@$(call install_fixup, pixman,SECTION,base)
+	@$(call install_fixup, pixman,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, pixman,DEPENDS,)
+	@$(call install_fixup, pixman,DESCRIPTION,missing)
+
+	@$(call install_copy, pixman, 0, 0, 0644, $(PIXMAN_DIR)/pixman/.libs/libpixman-1.so.0.9.5, /usr/lib/libpixman-1.so.0.9.5)
+	@$(call install_link, pixman, libpixman-1.so.0.9.5, /usr/lib/libpixman-1.so.0)
+	@$(call install_link, pixman, libpixman-1.so.0.9.5, /usr/lib/libpixman-1.so)
+
+	@$(call install_finish, pixman)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+pixman_clean:
+	rm -rf $(STATEDIR)/pixman.*
+	rm -rf $(IMAGEDIR)/pixman_*
+	rm -rf $(PIXMAN_DIR)
+
+# vim: syntax=make
diff --git a/rules/xcb-proto.in b/rules/xcb-proto.in
new file mode 100644
index 000000000..33bdfb4bf
--- /dev/null
+++ b/rules/xcb-proto.in
@@ -0,0 +1,7 @@
+config XCB_PROTO
+	bool
+	prompt "xcb-proto"
+	help
+	  The X protocol C-language Binding (XCB) is a replacement for Xlib
+	  featuring a small footprint, latency hiding, direct access to the
+	  protocol, improved threading support, and extensibility.
diff --git a/rules/xcb-proto.make b/rules/xcb-proto.make
new file mode 100644
index 000000000..411ebd537
--- /dev/null
+++ b/rules/xcb-proto.make
@@ -0,0 +1,129 @@
+# -*-makefile-*-
+# $Id: template 6655 2007-01-02 12:55:21Z rsc $
+#
+# Copyright (C) 2007 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_XCB_PROTO) += xcb-proto
+
+#
+# Paths and names
+#
+XCB_PROTO_VERSION		:= 1.0
+XCB_PROTO			:= xcb-proto-$(XCB_PROTO_VERSION)
+XCB_PROTO_SUFFIX		:= tar.bz2
+XCB_PROTO_URL		:= http://xcb.freedesktop.org/dist/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
+XCB_PROTO_SOURCE		:= $(SRCDIR)/$(XCB_PROTO).$(XCB_PROTO_SUFFIX)
+XCB_PROTO_DIR		:= $(BUILDDIR)/$(XCB_PROTO)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xcb-proto_get: $(STATEDIR)/xcb-proto.get
+
+$(STATEDIR)/xcb-proto.get: $(xcb-proto_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(XCB_PROTO_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, XCB_PROTO)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xcb-proto_extract: $(STATEDIR)/xcb-proto.extract
+
+$(STATEDIR)/xcb-proto.extract: $(xcb-proto_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XCB_PROTO_DIR))
+	@$(call extract, XCB_PROTO)
+	@$(call patchin, XCB_PROTO)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xcb-proto_prepare: $(STATEDIR)/xcb-proto.prepare
+
+XCB_PROTO_PATH	:= PATH=$(CROSS_PATH)
+XCB_PROTO_ENV 	:= $(CROSS_ENV)
+
+#
+# autoconf
+#
+XCB_PROTO_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/xcb-proto.prepare: $(xcb-proto_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XCB_PROTO_DIR)/config.cache)
+	cd $(XCB_PROTO_DIR) && \
+		$(XCB_PROTO_PATH) $(XCB_PROTO_ENV) \
+		./configure $(XCB_PROTO_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xcb-proto_compile: $(STATEDIR)/xcb-proto.compile
+
+$(STATEDIR)/xcb-proto.compile: $(xcb-proto_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(XCB_PROTO_DIR) && $(XCB_PROTO_PATH) $(MAKE) $(PARALLELMFLAGS)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xcb-proto_install: $(STATEDIR)/xcb-proto.install
+
+$(STATEDIR)/xcb-proto.install: $(xcb-proto_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, XCB_PROTO)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xcb-proto_targetinstall: $(STATEDIR)/xcb-proto.targetinstall
+
+$(STATEDIR)/xcb-proto.targetinstall: $(xcb-proto_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, xcb-proto)
+	@$(call install_fixup, xcb-proto,PACKAGE,xcb-proto)
+	@$(call install_fixup, xcb-proto,PRIORITY,optional)
+	@$(call install_fixup, xcb-proto,VERSION,$(XCB_PROTO_VERSION))
+	@$(call install_fixup, xcb-proto,SECTION,base)
+	@$(call install_fixup, xcb-proto,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup, xcb-proto,DEPENDS,)
+	@$(call install_fixup, xcb-proto,DESCRIPTION,missing)
+
+	@$(call install_finish, xcb-proto)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xcb-proto_clean:
+	rm -rf $(STATEDIR)/xcb-proto.*
+	rm -rf $(IMAGEDIR)/xcb-proto_*
+	rm -rf $(XCB_PROTO_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make
index a84bf04b1..e65c504cf 100644
--- a/rules/xorg-app-mkfontdir.make
+++ b/rules/xorg-app-mkfontdir.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTDIR) += xorg-app-mkfontdir
 #
 # Paths and names
 #
-XORG_APP_MKFONTDIR_VERSION	:= 1.0.2
-XORG_APP_MKFONTDIR		:= mkfontdir-X11R7.1-$(XORG_APP_MKFONTDIR_VERSION)
+XORG_APP_MKFONTDIR_VERSION	:= 1.0.3
+XORG_APP_MKFONTDIR		:= mkfontdir-$(XORG_APP_MKFONTDIR_VERSION)
 XORG_APP_MKFONTDIR_SUFFIX	:= tar.bz2
-XORG_APP_MKFONTDIR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
+XORG_APP_MKFONTDIR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
 XORG_APP_MKFONTDIR_SOURCE	:= $(SRCDIR)/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
 XORG_APP_MKFONTDIR_DIR		:= $(BUILDDIR)/$(XORG_APP_MKFONTDIR)
 
diff --git a/rules/xorg-app-mkfontscale.make b/rules/xorg-app-mkfontscale.make
index a308cd382..34c3397d9 100644
--- a/rules/xorg-app-mkfontscale.make
+++ b/rules/xorg-app-mkfontscale.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTSCALE) += xorg-app-mkfontscale
 #
 # Paths and names
 #
-XORG_APP_MKFONTSCALE_VERSION	:= 1.0.1
-XORG_APP_MKFONTSCALE		:= mkfontscale-X11R7.0-$(XORG_APP_MKFONTSCALE_VERSION)
+XORG_APP_MKFONTSCALE_VERSION	:= 1.0.3
+XORG_APP_MKFONTSCALE		:= mkfontscale-$(XORG_APP_MKFONTSCALE_VERSION)
 XORG_APP_MKFONTSCALE_SUFFIX	:= tar.bz2
-XORG_APP_MKFONTSCALE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX)
+XORG_APP_MKFONTSCALE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX)
 XORG_APP_MKFONTSCALE_SOURCE	:= $(SRCDIR)/$(XORG_APP_MKFONTSCALE).$(XORG_APP_MKFONTSCALE_SUFFIX)
 XORG_APP_MKFONTSCALE_DIR	:= $(BUILDDIR)/$(XORG_APP_MKFONTSCALE)
 
diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make
index b61def5ea..77a875491 100644
--- a/rules/xorg-app-rgb.make
+++ b/rules/xorg-app-rgb.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_APP_RGB) += xorg-app-rgb
 # Paths and names
 #
 XORG_APP_RGB_VERSION	:= 1.0.1
-XORG_APP_RGB		:= rgb-X11R7.1-$(XORG_APP_RGB_VERSION)
+XORG_APP_RGB		:= rgb-$(XORG_APP_RGB_VERSION)
 XORG_APP_RGB_SUFFIX	:= tar.bz2
-XORG_APP_RGB_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX)
+XORG_APP_RGB_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX)
 XORG_APP_RGB_SOURCE	:= $(SRCDIR)/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX)
 XORG_APP_RGB_DIR	:= $(BUILDDIR)/$(XORG_APP_RGB)
 
diff --git a/rules/xorg-app-setxkbmap.make b/rules/xorg-app-setxkbmap.make
index 9c5788d39..6acaa39d8 100644
--- a/rules/xorg-app-setxkbmap.make
+++ b/rules/xorg-app-setxkbmap.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_SETXKBMAP) += xorg-app-setxkbmap
 #
 # Paths and names
 #
-XORG_APP_SETXKBMAP_VERSION	:= 1.0.2
-XORG_APP_SETXKBMAP		:= setxkbmap-X11R7.1-$(XORG_APP_SETXKBMAP_VERSION)
+XORG_APP_SETXKBMAP_VERSION	:= 1.0.4
+XORG_APP_SETXKBMAP		:= setxkbmap-$(XORG_APP_SETXKBMAP_VERSION)
 XORG_APP_SETXKBMAP_SUFFIX	:= tar.bz2
-XORG_APP_SETXKBMAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app//$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX)
+XORG_APP_SETXKBMAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app//$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX)
 XORG_APP_SETXKBMAP_SOURCE	:= $(SRCDIR)/$(XORG_APP_SETXKBMAP).$(XORG_APP_SETXKBMAP_SUFFIX)
 XORG_APP_SETXKBMAP_DIR	:= $(BUILDDIR)/$(XORG_APP_SETXKBMAP)
 
diff --git a/rules/xorg-app-xdm.in b/rules/xorg-app-xdm.in
index 93f0276bf..4045232ec 100644
--- a/rules/xorg-app-xdm.in
+++ b/rules/xorg-app-xdm.in
@@ -5,6 +5,7 @@ config XORG_APP_XDM
 	select XORG_LIB_XPM
 	select XORG_LIB_XMU
 	select XORG_LIB_XAW
+	select XORG_LIB_XAW_V7
 # FIX: When the X server supports Xinerama, this package needs
 # the library ready for use!
 	select XORG_LIB_XINERAMA if XORG_SERVER_EXT_XINERAMA
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make
index cfcd0b0d4..24bcd5b7e 100644
--- a/rules/xorg-app-xdm.make
+++ b/rules/xorg-app-xdm.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XDM) += xorg-app-xdm
 #
 # Paths and names
 #
-XORG_APP_XDM_VERSION	:= 1.0.4
-XORG_APP_XDM		:= xdm-X11R7.1-$(XORG_APP_XDM_VERSION)
+XORG_APP_XDM_VERSION	:= 1.1.6
+XORG_APP_XDM		:= xdm-$(XORG_APP_XDM_VERSION)
 XORG_APP_XDM_SUFFIX	:= tar.bz2
-XORG_APP_XDM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
+XORG_APP_XDM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
 XORG_APP_XDM_SOURCE	:= $(SRCDIR)/$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
 XORG_APP_XDM_DIR	:= $(BUILDDIR)/$(XORG_APP_XDM)
 
diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make
index 31e7b6b1e..004aa65b0 100644
--- a/rules/xorg-app-xeyes.make
+++ b/rules/xorg-app-xeyes.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_APP_XEYES) += xorg-app-xeyes
 # Paths and names
 #
 XORG_APP_XEYES_VERSION	:= 1.0.1
-XORG_APP_XEYES		:= xeyes-X11R7.0-$(XORG_APP_XEYES_VERSION)
+XORG_APP_XEYES		:= xeyes-$(XORG_APP_XEYES_VERSION)
 XORG_APP_XEYES_SUFFIX	:= tar.bz2
-XORG_APP_XEYES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX)
+XORG_APP_XEYES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX)
 XORG_APP_XEYES_SOURCE	:= $(SRCDIR)/$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX)
 XORG_APP_XEYES_DIR	:= $(BUILDDIR)/$(XORG_APP_XEYES)
 
diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make
index a56f92747..c6b150403 100644
--- a/rules/xorg-app-xhost.make
+++ b/rules/xorg-app-xhost.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XHOST) += xorg-app-xhost
 #
 # Paths and names
 #
-XORG_APP_XHOST_VERSION	:= 1.0.1
-XORG_APP_XHOST		:= xhost-X11R7.1-$(XORG_APP_XHOST_VERSION)
+XORG_APP_XHOST_VERSION	:= 1.0.2
+XORG_APP_XHOST		:= xhost-$(XORG_APP_XHOST_VERSION)
 XORG_APP_XHOST_SUFFIX	:= tar.bz2
-XORG_APP_XHOST_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX)
+XORG_APP_XHOST_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX)
 XORG_APP_XHOST_SOURCE	:= $(SRCDIR)/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX)
 XORG_APP_XHOST_DIR	:= $(BUILDDIR)/$(XORG_APP_XHOST)
 
diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make
index c502473ee..3a4b759db 100644
--- a/rules/xorg-app-xinit.make
+++ b/rules/xorg-app-xinit.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XINIT) += xorg-app-xinit
 #
 # Paths and names
 #
-XORG_APP_XINIT_VERSION	:= 1.0.2
-XORG_APP_XINIT		:= xinit-X11R7.1-$(XORG_APP_XINIT_VERSION)
+XORG_APP_XINIT_VERSION	:= 1.0.5
+XORG_APP_XINIT		:= xinit-$(XORG_APP_XINIT_VERSION)
 XORG_APP_XINIT_SUFFIX	:= tar.bz2
-XORG_APP_XINIT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
+XORG_APP_XINIT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
 XORG_APP_XINIT_SOURCE	:= $(SRCDIR)/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
 XORG_APP_XINIT_DIR	:= $(BUILDDIR)/$(XORG_APP_XINIT)
 
diff --git a/rules/xorg-app-xkbcomp.make b/rules/xorg-app-xkbcomp.make
index 38637630a..9c41d3cd8 100644
--- a/rules/xorg-app-xkbcomp.make
+++ b/rules/xorg-app-xkbcomp.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XKBCOMP) += xorg-app-xkbcomp
 #
 # Paths and names
 #
-XORG_APP_XKBCOMP_VERSION	:= 1.0.2
-XORG_APP_XKBCOMP		:= xkbcomp-X11R7.1-$(XORG_APP_XKBCOMP_VERSION)
+XORG_APP_XKBCOMP_VERSION	:= 1.0.3
+XORG_APP_XKBCOMP		:= xkbcomp-$(XORG_APP_XKBCOMP_VERSION)
 XORG_APP_XKBCOMP_SUFFIX	:= tar.bz2
-XORG_APP_XKBCOMP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app//$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX)
+XORG_APP_XKBCOMP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app//$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX)
 XORG_APP_XKBCOMP_SOURCE	:= $(SRCDIR)/$(XORG_APP_XKBCOMP).$(XORG_APP_XKBCOMP_SUFFIX)
 XORG_APP_XKBCOMP_DIR	:= $(BUILDDIR)/$(XORG_APP_XKBCOMP)
 
diff --git a/rules/xorg-app-xrdb.make b/rules/xorg-app-xrdb.make
index ab1eed0b1..47eacfa12 100644
--- a/rules/xorg-app-xrdb.make
+++ b/rules/xorg-app-xrdb.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XRDB) += xorg-app-xrdb
 #
 # Paths and names
 #
-XORG_APP_XRDB_VERSION	:= 1.0.2
-XORG_APP_XRDB		:= xrdb-X11R7.1-$(XORG_APP_XRDB_VERSION)
+XORG_APP_XRDB_VERSION	:= 1.0.4
+XORG_APP_XRDB		:= xrdb-$(XORG_APP_XRDB_VERSION)
 XORG_APP_XRDB_SUFFIX		:= tar.bz2
-XORG_APP_XRDB_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX)
+XORG_APP_XRDB_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX)
 XORG_APP_XRDB_SOURCE		:= $(SRCDIR)/$(XORG_APP_XRDB).$(XORG_APP_XRDB_SUFFIX)
 XORG_APP_XRDB_DIR		:= $(BUILDDIR)/$(XORG_APP_XRDB)
 
diff --git a/rules/xorg-app-xset.make b/rules/xorg-app-xset.make
index 7f2895e6f..e6a6420ac 100644
--- a/rules/xorg-app-xset.make
+++ b/rules/xorg-app-xset.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XSET) += xorg-app-xset
 #
 # Paths and names
 #
-XORG_APP_XSET_VERSION	:= 1.0.2
-XORG_APP_XSET		:= xset-X11R7.1-$(XORG_APP_XSET_VERSION)
+XORG_APP_XSET_VERSION	:= 1.0.3
+XORG_APP_XSET		:= xset-$(XORG_APP_XSET_VERSION)
 XORG_APP_XSET_SUFFIX		:= tar.bz2
-XORG_APP_XSET_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/app/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX)
+XORG_APP_XSET_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX)
 XORG_APP_XSET_SOURCE		:= $(SRCDIR)/$(XORG_APP_XSET).$(XORG_APP_XSET_SUFFIX)
 XORG_APP_XSET_DIR		:= $(BUILDDIR)/$(XORG_APP_XSET)
 
diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make
index 35299081d..0f4c54639 100644
--- a/rules/xorg-app-xsetroot.make
+++ b/rules/xorg-app-xsetroot.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XSETROOT) += xorg-app-xsetroot
 #
 # Paths and names
 #
-XORG_APP_XSETROOT_VERSION	:= 1.0.1
-XORG_APP_XSETROOT		:= xsetroot-X11R7.0-$(XORG_APP_XSETROOT_VERSION)
+XORG_APP_XSETROOT_VERSION	:= 1.0.2
+XORG_APP_XSETROOT		:= xsetroot-$(XORG_APP_XSETROOT_VERSION)
 XORG_APP_XSETROOT_SUFFIX	:= tar.bz2
-XORG_APP_XSETROOT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app//$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX)
+XORG_APP_XSETROOT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX)
 XORG_APP_XSETROOT_SOURCE	:= $(SRCDIR)/$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX)
 XORG_APP_XSETROOT_DIR		:= $(BUILDDIR)/$(XORG_APP_XSETROOT)
 
diff --git a/rules/xorg-app-xvinfo.make b/rules/xorg-app-xvinfo.make
index 36ee73a4e..8822806c9 100644
--- a/rules/xorg-app-xvinfo.make
+++ b/rules/xorg-app-xvinfo.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XVINFO) += xorg-app-xvinfo
 #
 # Paths and names
 #
-XORG_APP_XVINFO_VERSION	:= 1.0.1
-XORG_APP_XVINFO		:= xvinfo-X11R7.0-$(XORG_APP_XVINFO_VERSION)
+XORG_APP_XVINFO_VERSION	:= 1.0.2
+XORG_APP_XVINFO		:= xvinfo-$(XORG_APP_XVINFO_VERSION)
 XORG_APP_XVINFO_SUFFIX	:= tar.bz2
-XORG_APP_XVINFO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/app//$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX)
+XORG_APP_XVINFO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/app//$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX)
 XORG_APP_XVINFO_SOURCE	:= $(SRCDIR)/$(XORG_APP_XVINFO).$(XORG_APP_XVINFO_SUFFIX)
 XORG_APP_XVINFO_DIR	:= $(BUILDDIR)/$(XORG_APP_XVINFO)
 
diff --git a/rules/xorg-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make
index b2fc0645c..b51364fae 100644
--- a/rules/xorg-data-xbitmaps.make
+++ b/rules/xorg-data-xbitmaps.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DATA_XBITMAPS) += xorg-data-xbitmaps
 # Paths and names
 #
 XORG_DATA_XBITMAPS_VERSION	:= 1.0.1
-XORG_DATA_XBITMAPS		:= xbitmaps-X11R7.0-$(XORG_DATA_XBITMAPS_VERSION)
+XORG_DATA_XBITMAPS		:= xbitmaps-$(XORG_DATA_XBITMAPS_VERSION)
 XORG_DATA_XBITMAPS_SUFFIX	:= tar.bz2
-XORG_DATA_XBITMAPS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/data/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX)
+XORG_DATA_XBITMAPS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/data/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX)
 XORG_DATA_XBITMAPS_SOURCE	:= $(SRCDIR)/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX)
 XORG_DATA_XBITMAPS_DIR		:= $(BUILDDIR)/$(XORG_DATA_XBITMAPS)
 
diff --git a/rules/xorg-driver-input-evdev.make b/rules/xorg-driver-input-evdev.make
index c856f1337..17641f5bd 100644
--- a/rules/xorg-driver-input-evdev.make
+++ b/rules/xorg-driver-input-evdev.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_EVDEV) += xorg-driver-input-evdev
 #
 # Paths and names
 #
-XORG_DRIVER_INPUT_EVDEV_VERSION	:= 1.1.2
-XORG_DRIVER_INPUT_EVDEV		:= xf86-input-evdev-X11R7.1-$(XORG_DRIVER_INPUT_EVDEV_VERSION)
+XORG_DRIVER_INPUT_EVDEV_VERSION	:= 1.1.5
+XORG_DRIVER_INPUT_EVDEV		:= xf86-input-evdev-$(XORG_DRIVER_INPUT_EVDEV_VERSION)
 XORG_DRIVER_INPUT_EVDEV_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_EVDEV_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
+XORG_DRIVER_INPUT_EVDEV_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/individual/driver/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
 XORG_DRIVER_INPUT_EVDEV_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
 XORG_DRIVER_INPUT_EVDEV_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_INPUT_EVDEV)
 
diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make
index f62f6790d..527f5c0ca 100644
--- a/rules/xorg-driver-input-keyboard.make
+++ b/rules/xorg-driver-input-keyboard.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_KEYBOARD) += xorg-driver-input-keyboard
 #
 # Paths and names
 #
-XORG_DRIVER_INPUT_KEYBOARD_VERSION	:= 1.1.0
-XORG_DRIVER_INPUT_KEYBOARD		:= xf86-input-keyboard-X11R7.1-$(XORG_DRIVER_INPUT_KEYBOARD_VERSION)
+XORG_DRIVER_INPUT_KEYBOARD_VERSION	:= 1.2.2
+XORG_DRIVER_INPUT_KEYBOARD		:= xf86-input-keyboard-$(XORG_DRIVER_INPUT_KEYBOARD_VERSION)
 XORG_DRIVER_INPUT_KEYBOARD_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_KEYBOARD_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
+XORG_DRIVER_INPUT_KEYBOARD_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
 XORG_DRIVER_INPUT_KEYBOARD_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
 XORG_DRIVER_INPUT_KEYBOARD_DIR		:= $(BUILDDIR)/$(XORG_DRIVER_INPUT_KEYBOARD)
 
@@ -114,7 +114,6 @@ $(STATEDIR)/xorg-driver-input-keyboard.targetinstall: $(xorg-driver-input-keyboa
 	@$(call install_fixup, xorg-driver-input-keyboard,DEPENDS,)
 	@$(call install_fixup, xorg-driver-input-keyboard,DESCRIPTION,missing)
 
-	@$(call install_copy, xorg-driver-input-keyboard, 0, 0, 0755, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)/src/.libs/keyboard_drv.so, /usr/lib/xorg/modules/keyboard_drv.so)
 	@$(call install_copy, xorg-driver-input-keyboard, 0, 0, 0755, $(XORG_DRIVER_INPUT_KEYBOARD_DIR)/src/.libs/kbd_drv.so, /usr/lib/xorg/modules/kbd_drv.so)
 
 	@$(call install_finish, xorg-driver-input-keyboard)
diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make
index 7191fa8bd..4e3e292b6 100644
--- a/rules/xorg-driver-input-mouse.make
+++ b/rules/xorg-driver-input-mouse.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_MOUSE) += xorg-driver-input-mouse
 #
 # Paths and names
 #
-XORG_DRIVER_INPUT_MOUSE_VERSION	:= 1.1.0
-XORG_DRIVER_INPUT_MOUSE		:= xf86-input-mouse-X11R7.1-$(XORG_DRIVER_INPUT_MOUSE_VERSION)
+XORG_DRIVER_INPUT_MOUSE_VERSION	:= 1.2.2
+XORG_DRIVER_INPUT_MOUSE		:= xf86-input-mouse-$(XORG_DRIVER_INPUT_MOUSE_VERSION)
 XORG_DRIVER_INPUT_MOUSE_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_MOUSE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
+XORG_DRIVER_INPUT_MOUSE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
 XORG_DRIVER_INPUT_MOUSE_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
 XORG_DRIVER_INPUT_MOUSE_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_INPUT_MOUSE)
 
@@ -59,7 +59,8 @@ $(STATEDIR)/xorg-driver-input-mouse.extract: $(xorg-driver-input-mouse_extract_d
 xorg-driver-input-mouse_prepare: $(STATEDIR)/xorg-driver-input-mouse.prepare
 
 XORG_DRIVER_INPUT_MOUSE_PATH	:=  PATH=$(CROSS_PATH)
-XORG_DRIVER_INPUT_MOUSE_ENV 	:=  $(CROSS_ENV)
+XORG_DRIVER_INPUT_MOUSE_ENV 	:=  $(CROSS_ENV) \
+	ac_cv_file__usr_share_sgml_X11_defs_ent=no
 
 #
 # autoconf
diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make
index 9ef6d8153..3cd6f1266 100644
--- a/rules/xorg-driver-input-tslib.make
+++ b/rules/xorg-driver-input-tslib.make
@@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_TSLIB) += xorg-driver-input-tslib
 #
 # Paths and names
 #
-XORG_DRIVER_INPUT_TSLIB_VERSION	:= 0.0.3
+XORG_DRIVER_INPUT_TSLIB_VERSION	:= 0.0.4
 XORG_DRIVER_INPUT_TSLIB		:= xf86-input-tslib-$(XORG_DRIVER_INPUT_TSLIB_VERSION)
 XORG_DRIVER_INPUT_TSLIB_SUFFIX	:= tar.bz2
 XORG_DRIVER_INPUT_TSLIB_URL	:= http://www.pengutronix.de/software/ptxdist/temporary-src/$(XORG_DRIVER_INPUT_TSLIB).$(XORG_DRIVER_INPUT_TSLIB_SUFFIX)
diff --git a/rules/xorg-driver-input-void.make b/rules/xorg-driver-input-void.make
index dca11fd0c..d1822e681 100644
--- a/rules/xorg-driver-input-void.make
+++ b/rules/xorg-driver-input-void.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_VOID) += xorg-driver-input-void
 # Paths and names
 #
 XORG_DRIVER_INPUT_VOID_VERSION	:= 1.1.0
-XORG_DRIVER_INPUT_VOID		:= xf86-input-void-X11R7.1-$(XORG_DRIVER_INPUT_VOID_VERSION)
+XORG_DRIVER_INPUT_VOID		:= xf86-input-void-$(XORG_DRIVER_INPUT_VOID_VERSION)
 XORG_DRIVER_INPUT_VOID_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_VOID_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX)
+XORG_DRIVER_INPUT_VOID_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX)
 XORG_DRIVER_INPUT_VOID_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX)
 XORG_DRIVER_INPUT_VOID_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_INPUT_VOID)
 
diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make
index be47c2094..0fc71b68f 100644
--- a/rules/xorg-driver-video-apm.make
+++ b/rules/xorg-driver-video-apm.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_APM) += xorg-driver-video-apm
 # Paths and names
 #
 XORG_DRIVER_VIDEO_APM_VERSION	:= 1.1.1
-XORG_DRIVER_VIDEO_APM		:= xf86-video-apm-X11R7.1-$(XORG_DRIVER_VIDEO_APM_VERSION)
+XORG_DRIVER_VIDEO_APM		:= xf86-video-apm-$(XORG_DRIVER_VIDEO_APM_VERSION)
 XORG_DRIVER_VIDEO_APM_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_APM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
+XORG_DRIVER_VIDEO_APM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
 XORG_DRIVER_VIDEO_APM_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
 XORG_DRIVER_VIDEO_APM_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_APM)
 
diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make
index 0208e370e..e68d069ce 100644
--- a/rules/xorg-driver-video-dummy.make
+++ b/rules/xorg-driver-video-dummy.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_DUMMY) += xorg-driver-video-dummy
 # Paths and names
 #
 XORG_DRIVER_VIDEO_DUMMY_VERSION	:= 0.2.0
-XORG_DRIVER_VIDEO_DUMMY		:= xf86-video-dummy-X11R7.1-$(XORG_DRIVER_VIDEO_DUMMY_VERSION)
+XORG_DRIVER_VIDEO_DUMMY		:= xf86-video-dummy-$(XORG_DRIVER_VIDEO_DUMMY_VERSION)
 XORG_DRIVER_VIDEO_DUMMY_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_DUMMY_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
+XORG_DRIVER_VIDEO_DUMMY_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
 XORG_DRIVER_VIDEO_DUMMY_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
 XORG_DRIVER_VIDEO_DUMMY_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_DUMMY)
 
diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make
index 4b08a527c..02b6a9b0c 100644
--- a/rules/xorg-driver-video-fbdev.make
+++ b/rules/xorg-driver-video-fbdev.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_FBDEV) += xorg-driver-video-fbdev
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_FBDEV_VERSION	:= 0.3.0
-XORG_DRIVER_VIDEO_FBDEV		:= xf86-video-fbdev-X11R7.1-$(XORG_DRIVER_VIDEO_FBDEV_VERSION)
+XORG_DRIVER_VIDEO_FBDEV_VERSION	:= 0.3.1
+XORG_DRIVER_VIDEO_FBDEV		:= xf86-video-fbdev-$(XORG_DRIVER_VIDEO_FBDEV_VERSION)
 XORG_DRIVER_VIDEO_FBDEV_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_FBDEV_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
+XORG_DRIVER_VIDEO_FBDEV_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
 XORG_DRIVER_VIDEO_FBDEV_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
 XORG_DRIVER_VIDEO_FBDEV_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_FBDEV)
 
diff --git a/rules/xorg-driver-video-nsc.make b/rules/xorg-driver-video-nsc.make
index 85e2612e3..070b3e04c 100644
--- a/rules/xorg-driver-video-nsc.make
+++ b/rules/xorg-driver-video-nsc.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_NSC) += xorg-driver-video-nsc
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_NSC_VERSION	:= 2.8.1
-XORG_DRIVER_VIDEO_NSC		:= xf86-video-nsc-X11R7.1-$(XORG_DRIVER_VIDEO_NSC_VERSION)
+XORG_DRIVER_VIDEO_NSC_VERSION	:= 2.8.3
+XORG_DRIVER_VIDEO_NSC		:= xf86-video-nsc-$(XORG_DRIVER_VIDEO_NSC_VERSION)
 XORG_DRIVER_VIDEO_NSC_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_NSC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_NSC).$(XORG_DRIVER_VIDEO_NSC_SUFFIX)
+XORG_DRIVER_VIDEO_NSC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_NSC).$(XORG_DRIVER_VIDEO_NSC_SUFFIX)
 XORG_DRIVER_VIDEO_NSC_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_NSC).$(XORG_DRIVER_VIDEO_NSC_SUFFIX)
 XORG_DRIVER_VIDEO_NSC_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_NSC)
 
diff --git a/rules/xorg-driver-video-v4l.make b/rules/xorg-driver-video-v4l.make
index 46a566048..29231c905 100644
--- a/rules/xorg-driver-video-v4l.make
+++ b/rules/xorg-driver-video-v4l.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_V4L) += xorg-driver-video-v4l
 # Paths and names
 #
 XORG_DRIVER_VIDEO_V4L_VERSION	:= 0.1.1
-XORG_DRIVER_VIDEO_V4L		:= xf86-video-v4l-X11R7.1-$(XORG_DRIVER_VIDEO_V4L_VERSION)
+XORG_DRIVER_VIDEO_V4L		:= xf86-video-v4l-$(XORG_DRIVER_VIDEO_V4L_VERSION)
 XORG_DRIVER_VIDEO_V4L_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_V4L_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX)
+XORG_DRIVER_VIDEO_V4L_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX)
 XORG_DRIVER_VIDEO_V4L_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX)
 XORG_DRIVER_VIDEO_V4L_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_V4L)
 
diff --git a/rules/xorg-driver-video-vesa.make b/rules/xorg-driver-video-vesa.make
index 9cfd73246..7f31fad25 100644
--- a/rules/xorg-driver-video-vesa.make
+++ b/rules/xorg-driver-video-vesa.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_VESA) += xorg-driver-video-vesa
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_VESA_VERSION	:= 1.2.0
-XORG_DRIVER_VIDEO_VESA		:= xf86-video-vesa-X11R7.1-$(XORG_DRIVER_VIDEO_VESA_VERSION)
+XORG_DRIVER_VIDEO_VESA_VERSION	:= 1.3.0
+XORG_DRIVER_VIDEO_VESA		:= xf86-video-vesa-$(XORG_DRIVER_VIDEO_VESA_VERSION)
 XORG_DRIVER_VIDEO_VESA_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_VESA_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX)
+XORG_DRIVER_VIDEO_VESA_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX)
 XORG_DRIVER_VIDEO_VESA_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX)
 XORG_DRIVER_VIDEO_VESA_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VESA)
 
diff --git a/rules/xorg-driver-video-vga.make b/rules/xorg-driver-video-vga.make
index 674301f04..9f92a8239 100644
--- a/rules/xorg-driver-video-vga.make
+++ b/rules/xorg-driver-video-vga.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_VGA) += xorg-driver-video-vga
 # Paths and names
 #
 XORG_DRIVER_VIDEO_VGA_VERSION	:= 4.1.0
-XORG_DRIVER_VIDEO_VGA		:= xf86-video-vga-X11R7.1-$(XORG_DRIVER_VIDEO_VGA_VERSION)
+XORG_DRIVER_VIDEO_VGA		:= xf86-video-vga-$(XORG_DRIVER_VIDEO_VGA_VERSION)
 XORG_DRIVER_VIDEO_VGA_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_VGA_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX)
+XORG_DRIVER_VIDEO_VGA_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/driver/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX)
 XORG_DRIVER_VIDEO_VGA_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX)
 XORG_DRIVER_VIDEO_VGA_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VGA)
 
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make
index ce99aa6b9..a5021cb1f 100644
--- a/rules/xorg-font-adobe-100dpi.make
+++ b/rules/xorg-font-adobe-100dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_100DPI) += xorg-font-adobe-100dpi
 # Paths and names
 #
 XORG_FONT_ADOBE_100DPI_VERSION	:= 1.0.0
-XORG_FONT_ADOBE_100DPI		:= font-adobe-100dpi-X11R7.0-$(XORG_FONT_ADOBE_100DPI_VERSION)
+XORG_FONT_ADOBE_100DPI		:= font-adobe-100dpi-$(XORG_FONT_ADOBE_100DPI_VERSION)
 XORG_FONT_ADOBE_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
+XORG_FONT_ADOBE_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
 XORG_FONT_ADOBE_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
 XORG_FONT_ADOBE_100DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_100DPI)
 
diff --git a/rules/xorg-font-adobe-75dpi.make b/rules/xorg-font-adobe-75dpi.make
index e9e8b801b..fb2f0cb6f 100644
--- a/rules/xorg-font-adobe-75dpi.make
+++ b/rules/xorg-font-adobe-75dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_75DPI) += xorg-font-adobe-75dpi
 # Paths and names
 #
 XORG_FONT_ADOBE_75DPI_VERSION	:= 1.0.0
-XORG_FONT_ADOBE_75DPI		:= font-adobe-75dpi-X11R7.0-$(XORG_FONT_ADOBE_75DPI_VERSION)
+XORG_FONT_ADOBE_75DPI		:= font-adobe-75dpi-$(XORG_FONT_ADOBE_75DPI_VERSION)
 XORG_FONT_ADOBE_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
+XORG_FONT_ADOBE_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
 XORG_FONT_ADOBE_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
 XORG_FONT_ADOBE_75DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_75DPI)
 
diff --git a/rules/xorg-font-adobe-utopia-100dpi.make b/rules/xorg-font-adobe-utopia-100dpi.make
index ad17e493a..2e7cde0aa 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.make
+++ b/rules/xorg-font-adobe-utopia-100dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI) += xorg-font-adobe-utopia-100d
 # Paths and names
 #
 XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION	:= 1.0.1
-XORG_FONT_ADOBE_UTOPIA_100DPI		:= font-adobe-utopia-100dpi-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION)
+XORG_FONT_ADOBE_UTOPIA_100DPI		:= font-adobe-utopia-100dpi-$(XORG_FONT_ADOBE_UTOPIA_100DPI_VERSION)
 XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI).$(XORG_FONT_ADOBE_UTOPIA_100DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_100DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_100DPI)
 
diff --git a/rules/xorg-font-adobe-utopia-75dpi.make b/rules/xorg-font-adobe-utopia-75dpi.make
index 8cee0a666..451a1147e 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.make
+++ b/rules/xorg-font-adobe-utopia-75dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI) += xorg-font-adobe-utopia-75dpi
 # Paths and names
 #
 XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION	:= 1.0.1
-XORG_FONT_ADOBE_UTOPIA_75DPI		:= font-adobe-utopia-75dpi-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION)
+XORG_FONT_ADOBE_UTOPIA_75DPI		:= font-adobe-utopia-75dpi-$(XORG_FONT_ADOBE_UTOPIA_75DPI_VERSION)
 XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_75DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI).$(XORG_FONT_ADOBE_UTOPIA_75DPI_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_75DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_75DPI)
 
diff --git a/rules/xorg-font-adobe-utopia-type1.make b/rules/xorg-font-adobe-utopia-type1.make
index 32fdbc1c5..edc1e5fac 100644
--- a/rules/xorg-font-adobe-utopia-type1.make
+++ b/rules/xorg-font-adobe-utopia-type1.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_TYPE1) += xorg-font-adobe-utopia-type1
 # Paths and names
 #
 XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION	:= 1.0.1
-XORG_FONT_ADOBE_UTOPIA_TYPE1		:= font-adobe-utopia-type1-X11R7.0-$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION)
+XORG_FONT_ADOBE_UTOPIA_TYPE1		:= font-adobe-utopia-type1-$(XORG_FONT_ADOBE_UTOPIA_TYPE1_VERSION)
 XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
+XORG_FONT_ADOBE_UTOPIA_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1).$(XORG_FONT_ADOBE_UTOPIA_TYPE1_SUFFIX)
 XORG_FONT_ADOBE_UTOPIA_TYPE1_DIR	:= $(BUILDDIR)/$(XORG_FONT_ADOBE_UTOPIA_TYPE1)
 
diff --git a/rules/xorg-font-alias.make b/rules/xorg-font-alias.make
index d7bd8c6cb..56156fcb7 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias
 # Paths and names
 #
 XORG_FONT_ALIAS_VERSION	:= 1.0.1
-XORG_FONT_ALIAS		:= font-alias-X11R7.0-$(XORG_FONT_ALIAS_VERSION)
+XORG_FONT_ALIAS		:= font-alias-$(XORG_FONT_ALIAS_VERSION)
 XORG_FONT_ALIAS_SUFFIX	:= tar.bz2
-XORG_FONT_ALIAS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
+XORG_FONT_ALIAS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
 XORG_FONT_ALIAS_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
 XORG_FONT_ALIAS_DIR	:= $(BUILDDIR)/$(XORG_FONT_ALIAS)
 
diff --git a/rules/xorg-font-arabic-misc.make b/rules/xorg-font-arabic-misc.make
index 46d13edfd..27de86807 100644
--- a/rules/xorg-font-arabic-misc.make
+++ b/rules/xorg-font-arabic-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ARABIC_MISC) += xorg-font-arabic-misc
 # Paths and names
 #
 XORG_FONT_ARABIC_MISC_VERSION	:= 1.0.0
-XORG_FONT_ARABIC_MISC		:= font-arabic-misc-X11R7.0-$(XORG_FONT_ARABIC_MISC_VERSION)
+XORG_FONT_ARABIC_MISC		:= font-arabic-misc-$(XORG_FONT_ARABIC_MISC_VERSION)
 XORG_FONT_ARABIC_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_ARABIC_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
+XORG_FONT_ARABIC_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
 XORG_FONT_ARABIC_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
 XORG_FONT_ARABIC_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_ARABIC_MISC)
 
diff --git a/rules/xorg-font-bh-100dpi.make b/rules/xorg-font-bh-100dpi.make
index 3e894e541..a45c1cc00 100644
--- a/rules/xorg-font-bh-100dpi.make
+++ b/rules/xorg-font-bh-100dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_100DPI) += xorg-font-bh-100dpi
 # Paths and names
 #
 XORG_FONT_BH_100DPI_VERSION	:= 1.0.0
-XORG_FONT_BH_100DPI		:= font-bh-100dpi-X11R7.0-$(XORG_FONT_BH_100DPI_VERSION)
+XORG_FONT_BH_100DPI		:= font-bh-100dpi-$(XORG_FONT_BH_100DPI_VERSION)
 XORG_FONT_BH_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
+XORG_FONT_BH_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
 XORG_FONT_BH_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
 XORG_FONT_BH_100DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_100DPI)
 
diff --git a/rules/xorg-font-bh-75dpi.make b/rules/xorg-font-bh-75dpi.make
index 16d977aad..7505fdfbb 100644
--- a/rules/xorg-font-bh-75dpi.make
+++ b/rules/xorg-font-bh-75dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_75DPI) += xorg-font-bh-75dpi
 # Paths and names
 #
 XORG_FONT_BH_75DPI_VERSION	:= 1.0.0
-XORG_FONT_BH_75DPI		:= font-bh-75dpi-X11R7.0-$(XORG_FONT_BH_75DPI_VERSION)
+XORG_FONT_BH_75DPI		:= font-bh-75dpi-$(XORG_FONT_BH_75DPI_VERSION)
 XORG_FONT_BH_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
+XORG_FONT_BH_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
 XORG_FONT_BH_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
 XORG_FONT_BH_75DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_75DPI)
 
diff --git a/rules/xorg-font-bh-lucidatypewriter-100dpi.make b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
index 71037b1c4..8caf7799b 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) += xorg-font-bh-lucidat
 # Paths and names
 #
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION	:= 1.0.0
-XORG_FONT_BH_LUCIDATYPEWRITER_100DPI		:= font-bh-lucidatypewriter-100dpi-X11R7.0-$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION)
+XORG_FONT_BH_LUCIDATYPEWRITER_100DPI		:= font-bh-lucidatypewriter-100dpi-$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION)
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
+XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_DIR	:= $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_100DPI)
 
diff --git a/rules/xorg-font-bh-lucidatypewriter-75dpi.make b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
index 3c6c2171a..5929bbcd5 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) += xorg-font-bh-lucidaty
 # Paths and names
 #
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION	:= 1.0.0
-XORG_FONT_BH_LUCIDATYPEWRITER_75DPI		:= font-bh-lucidatypewriter-75dpi-X11R7.0-$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION)
+XORG_FONT_BH_LUCIDATYPEWRITER_75DPI		:= font-bh-lucidatypewriter-75dpi-$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION)
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
+XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI).$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_SUFFIX)
 XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_LUCIDATYPEWRITER_75DPI)
 
diff --git a/rules/xorg-font-bh-ttf.make b/rules/xorg-font-bh-ttf.make
index 6d7139ccd..739cefe1c 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_TTF) += xorg-font-bh-ttf
 # Paths and names
 #
 XORG_FONT_BH_TTF_VERSION	:= 1.0.0
-XORG_FONT_BH_TTF		:= font-bh-ttf-X11R7.0-$(XORG_FONT_BH_TTF_VERSION)
+XORG_FONT_BH_TTF		:= font-bh-ttf-$(XORG_FONT_BH_TTF_VERSION)
 XORG_FONT_BH_TTF_SUFFIX		:= tar.bz2
-XORG_FONT_BH_TTF_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
+XORG_FONT_BH_TTF_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
 XORG_FONT_BH_TTF_SOURCE		:= $(SRCDIR)/$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
 XORG_FONT_BH_TTF_DIR		:= $(BUILDDIR)/$(XORG_FONT_BH_TTF)
 
diff --git a/rules/xorg-font-bitstream-100dpi.make b/rules/xorg-font-bitstream-100dpi.make
index f0315a439..22e6a3142 100644
--- a/rules/xorg-font-bitstream-100dpi.make
+++ b/rules/xorg-font-bitstream-100dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_100DPI) += xorg-font-bitstream-100dpi
 # Paths and names
 #
 XORG_FONT_BITSTREAM_100DPI_VERSION	:= 1.0.0
-XORG_FONT_BITSTREAM_100DPI		:= font-bitstream-100dpi-X11R7.0-$(XORG_FONT_BITSTREAM_100DPI_VERSION)
+XORG_FONT_BITSTREAM_100DPI		:= font-bitstream-100dpi-$(XORG_FONT_BITSTREAM_100DPI_VERSION)
 XORG_FONT_BITSTREAM_100DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
+XORG_FONT_BITSTREAM_100DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
 XORG_FONT_BITSTREAM_100DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
 XORG_FONT_BITSTREAM_100DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_100DPI)
 
diff --git a/rules/xorg-font-bitstream-75dpi.make b/rules/xorg-font-bitstream-75dpi.make
index 20bfaa05f..820eef297 100644
--- a/rules/xorg-font-bitstream-75dpi.make
+++ b/rules/xorg-font-bitstream-75dpi.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_75DPI) += xorg-font-bitstream-75dpi
 # Paths and names
 #
 XORG_FONT_BITSTREAM_75DPI_VERSION	:= 1.0.0
-XORG_FONT_BITSTREAM_75DPI		:= font-bitstream-75dpi-X11R7.0-$(XORG_FONT_BITSTREAM_75DPI_VERSION)
+XORG_FONT_BITSTREAM_75DPI		:= font-bitstream-75dpi-$(XORG_FONT_BITSTREAM_75DPI_VERSION)
 XORG_FONT_BITSTREAM_75DPI_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
+XORG_FONT_BITSTREAM_75DPI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
 XORG_FONT_BITSTREAM_75DPI_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
 XORG_FONT_BITSTREAM_75DPI_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_75DPI)
 
diff --git a/rules/xorg-font-bitstream-speedo.make b/rules/xorg-font-bitstream-speedo.make
index 83414ab7e..4e77d81d5 100644
--- a/rules/xorg-font-bitstream-speedo.make
+++ b/rules/xorg-font-bitstream-speedo.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_SPEEDO) += xorg-font-bitstream-speedo
 # Paths and names
 #
 XORG_FONT_BITSTREAM_SPEEDO_VERSION	:= 1.0.0
-XORG_FONT_BITSTREAM_SPEEDO		:= font-bitstream-speedo-X11R7.0-$(XORG_FONT_BITSTREAM_SPEEDO_VERSION)
+XORG_FONT_BITSTREAM_SPEEDO		:= font-bitstream-speedo-$(XORG_FONT_BITSTREAM_SPEEDO_VERSION)
 XORG_FONT_BITSTREAM_SPEEDO_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_SPEEDO_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
+XORG_FONT_BITSTREAM_SPEEDO_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
 XORG_FONT_BITSTREAM_SPEEDO_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
 XORG_FONT_BITSTREAM_SPEEDO_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_SPEEDO)
 
diff --git a/rules/xorg-font-bitstream-type1.make b/rules/xorg-font-bitstream-type1.make
index 3f5b7d0fa..4cefb1851 100644
--- a/rules/xorg-font-bitstream-type1.make
+++ b/rules/xorg-font-bitstream-type1.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_TYPE1) += xorg-font-bitstream-type1
 # Paths and names
 #
 XORG_FONT_BITSTREAM_TYPE1_VERSION	:= 1.0.0
-XORG_FONT_BITSTREAM_TYPE1		:= font-bitstream-type1-X11R7.0-$(XORG_FONT_BITSTREAM_TYPE1_VERSION)
+XORG_FONT_BITSTREAM_TYPE1		:= font-bitstream-type1-$(XORG_FONT_BITSTREAM_TYPE1_VERSION)
 XORG_FONT_BITSTREAM_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
+XORG_FONT_BITSTREAM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
 XORG_FONT_BITSTREAM_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
 XORG_FONT_BITSTREAM_TYPE1_DIR		:= $(BUILDDIR)/$(XORG_FONT_BITSTREAM_TYPE1)
 
diff --git a/rules/xorg-font-cronyx-cyrillic.make b/rules/xorg-font-cronyx-cyrillic.make
index fe8c63ef8..cd016e25c 100644
--- a/rules/xorg-font-cronyx-cyrillic.make
+++ b/rules/xorg-font-cronyx-cyrillic.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_CRONYX_CYRILLIC) += xorg-font-cronyx-cyrillic
 # Paths and names
 #
 XORG_FONT_CRONYX_CYRILLIC_VERSION	:= 1.0.0
-XORG_FONT_CRONYX_CYRILLIC		:= font-cronyx-cyrillic-X11R7.0-$(XORG_FONT_CRONYX_CYRILLIC_VERSION)
+XORG_FONT_CRONYX_CYRILLIC		:= font-cronyx-cyrillic-$(XORG_FONT_CRONYX_CYRILLIC_VERSION)
 XORG_FONT_CRONYX_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_CRONYX_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
+XORG_FONT_CRONYX_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
 XORG_FONT_CRONYX_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_CRONYX_CYRILLIC).$(XORG_FONT_CRONYX_CYRILLIC_SUFFIX)
 XORG_FONT_CRONYX_CYRILLIC_DIR		:= $(BUILDDIR)/$(XORG_FONT_CRONYX_CYRILLIC)
 
diff --git a/rules/xorg-font-cursor-misc.make b/rules/xorg-font-cursor-misc.make
index 4105bcac9..e5d4bd800 100644
--- a/rules/xorg-font-cursor-misc.make
+++ b/rules/xorg-font-cursor-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_CURSOR_MISC) += xorg-font-cursor-misc
 # Paths and names
 #
 XORG_FONT_CURSOR_MISC_VERSION	:= 1.0.0
-XORG_FONT_CURSOR_MISC		:= font-cursor-misc-X11R7.0-$(XORG_FONT_CURSOR_MISC_VERSION)
+XORG_FONT_CURSOR_MISC		:= font-cursor-misc-$(XORG_FONT_CURSOR_MISC_VERSION)
 XORG_FONT_CURSOR_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_CURSOR_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
+XORG_FONT_CURSOR_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font//$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
 XORG_FONT_CURSOR_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
 XORG_FONT_CURSOR_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_CURSOR_MISC)
 
diff --git a/rules/xorg-font-daewoo-misc.make b/rules/xorg-font-daewoo-misc.make
index cae3cd3d3..ce1750874 100644
--- a/rules/xorg-font-daewoo-misc.make
+++ b/rules/xorg-font-daewoo-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_DAEWOO_MISC) += xorg-font-daewoo-misc
 # Paths and names
 #
 XORG_FONT_DAEWOO_MISC_VERSION	:= 1.0.0
-XORG_FONT_DAEWOO_MISC		:= font-daewoo-misc-X11R7.0-$(XORG_FONT_DAEWOO_MISC_VERSION)
+XORG_FONT_DAEWOO_MISC		:= font-daewoo-misc-$(XORG_FONT_DAEWOO_MISC_VERSION)
 XORG_FONT_DAEWOO_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_DAEWOO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
+XORG_FONT_DAEWOO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
 XORG_FONT_DAEWOO_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
 XORG_FONT_DAEWOO_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_DAEWOO_MISC)
 
diff --git a/rules/xorg-font-dec-misc.make b/rules/xorg-font-dec-misc.make
index 5d61cd498..2b86b6077 100644
--- a/rules/xorg-font-dec-misc.make
+++ b/rules/xorg-font-dec-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_DEC_MISC) += xorg-font-dec-misc
 # Paths and names
 #
 XORG_FONT_DEC_MISC_VERSION	:= 1.0.0
-XORG_FONT_DEC_MISC		:= font-dec-misc-X11R7.0-$(XORG_FONT_DEC_MISC_VERSION)
+XORG_FONT_DEC_MISC		:= font-dec-misc-$(XORG_FONT_DEC_MISC_VERSION)
 XORG_FONT_DEC_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_DEC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
+XORG_FONT_DEC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
 XORG_FONT_DEC_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
 XORG_FONT_DEC_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_DEC_MISC)
 
diff --git a/rules/xorg-font-encodings.make b/rules/xorg-font-encodings.make
index 9cba979dd..91a283959 100644
--- a/rules/xorg-font-encodings.make
+++ b/rules/xorg-font-encodings.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_FONT_ENCODINGS) += xorg-font-encodings
 #
 # Paths and names
 #
-XORG_FONT_ENCODINGS_VERSION	:= 1.0.0
-XORG_FONT_ENCODINGS		:= encodings-X11R7.0-$(XORG_FONT_ENCODINGS_VERSION)
+XORG_FONT_ENCODINGS_VERSION	:= 1.0.2
+XORG_FONT_ENCODINGS		:= encodings-$(XORG_FONT_ENCODINGS_VERSION)
 XORG_FONT_ENCODINGS_SUFFIX	:= tar.bz2
-XORG_FONT_ENCODINGS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
+XORG_FONT_ENCODINGS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
 XORG_FONT_ENCODINGS_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
 XORG_FONT_ENCODINGS_DIR		:= $(BUILDDIR)/$(XORG_FONT_ENCODINGS)
 
diff --git a/rules/xorg-font-ibm-type1.make b/rules/xorg-font-ibm-type1.make
index 1f0698e76..8303af360 100644
--- a/rules/xorg-font-ibm-type1.make
+++ b/rules/xorg-font-ibm-type1.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_IBM_TYPE1) += xorg-font-ibm-type1
 # Paths and names
 #
 XORG_FONT_IBM_TYPE1_VERSION	:= 1.0.0
-XORG_FONT_IBM_TYPE1		:= font-ibm-type1-X11R7.0-$(XORG_FONT_IBM_TYPE1_VERSION)
+XORG_FONT_IBM_TYPE1		:= font-ibm-type1-$(XORG_FONT_IBM_TYPE1_VERSION)
 XORG_FONT_IBM_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_IBM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
+XORG_FONT_IBM_TYPE1_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
 XORG_FONT_IBM_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
 XORG_FONT_IBM_TYPE1_DIR		:= $(BUILDDIR)/$(XORG_FONT_IBM_TYPE1)
 
diff --git a/rules/xorg-font-isas-misc.make b/rules/xorg-font-isas-misc.make
index 8d11c1dee..e300cf7b1 100644
--- a/rules/xorg-font-isas-misc.make
+++ b/rules/xorg-font-isas-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_ISAS_MISC) += xorg-font-isas-misc
 # Paths and names
 #
 XORG_FONT_ISAS_MISC_VERSION	:= 1.0.0
-XORG_FONT_ISAS_MISC		:= font-isas-misc-X11R7.0-$(XORG_FONT_ISAS_MISC_VERSION)
+XORG_FONT_ISAS_MISC		:= font-isas-misc-$(XORG_FONT_ISAS_MISC_VERSION)
 XORG_FONT_ISAS_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_ISAS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
+XORG_FONT_ISAS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
 XORG_FONT_ISAS_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
 XORG_FONT_ISAS_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_ISAS_MISC)
 
diff --git a/rules/xorg-font-jis-misc.make b/rules/xorg-font-jis-misc.make
index 8556658bd..54894c317 100644
--- a/rules/xorg-font-jis-misc.make
+++ b/rules/xorg-font-jis-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_JIS_MISC) += xorg-font-jis-misc
 # Paths and names
 #
 XORG_FONT_JIS_MISC_VERSION	:= 1.0.0
-XORG_FONT_JIS_MISC		:= font-jis-misc-X11R7.0-$(XORG_FONT_JIS_MISC_VERSION)
+XORG_FONT_JIS_MISC		:= font-jis-misc-$(XORG_FONT_JIS_MISC_VERSION)
 XORG_FONT_JIS_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_JIS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
+XORG_FONT_JIS_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
 XORG_FONT_JIS_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
 XORG_FONT_JIS_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_JIS_MISC)
 
diff --git a/rules/xorg-font-micro-misc.make b/rules/xorg-font-micro-misc.make
index 6e5dfd718..5b057cccd 100644
--- a/rules/xorg-font-micro-misc.make
+++ b/rules/xorg-font-micro-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MICRO_MISC) += xorg-font-micro-misc
 # Paths and names
 #
 XORG_FONT_MICRO_MISC_VERSION	:= 1.0.0
-XORG_FONT_MICRO_MISC		:= font-micro-misc-X11R7.0-$(XORG_FONT_MICRO_MISC_VERSION)
+XORG_FONT_MICRO_MISC		:= font-micro-misc-$(XORG_FONT_MICRO_MISC_VERSION)
 XORG_FONT_MICRO_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_MICRO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
+XORG_FONT_MICRO_MISC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
 XORG_FONT_MICRO_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
 XORG_FONT_MICRO_MISC_DIR	:= $(BUILDDIR)/$(XORG_FONT_MICRO_MISC)
 
diff --git a/rules/xorg-font-misc-cyrillic.make b/rules/xorg-font-misc-cyrillic.make
index eccbeb83e..f5be29381 100644
--- a/rules/xorg-font-misc-cyrillic.make
+++ b/rules/xorg-font-misc-cyrillic.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_CYRILLIC) += xorg-font-misc-cyrillic
 # Paths and names
 #
 XORG_FONT_MISC_CYRILLIC_VERSION	:= 1.0.0
-XORG_FONT_MISC_CYRILLIC		:= font-misc-cyrillic-X11R7.0-$(XORG_FONT_MISC_CYRILLIC_VERSION)
+XORG_FONT_MISC_CYRILLIC		:= font-misc-cyrillic-$(XORG_FONT_MISC_CYRILLIC_VERSION)
 XORG_FONT_MISC_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_CYRILLIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
+XORG_FONT_MISC_CYRILLIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
 XORG_FONT_MISC_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
 XORG_FONT_MISC_CYRILLIC_DIR	:= $(BUILDDIR)/$(XORG_FONT_MISC_CYRILLIC)
 
diff --git a/rules/xorg-font-misc-ethiopic.make b/rules/xorg-font-misc-ethiopic.make
index d51993adb..78cde247b 100644
--- a/rules/xorg-font-misc-ethiopic.make
+++ b/rules/xorg-font-misc-ethiopic.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_ETHIOPIC) += xorg-font-misc-ethiopic
 # Paths and names
 #
 XORG_FONT_MISC_ETHIOPIC_VERSION	:= 1.0.0
-XORG_FONT_MISC_ETHIOPIC		:= font-misc-ethiopic-X11R7.0-$(XORG_FONT_MISC_ETHIOPIC_VERSION)
+XORG_FONT_MISC_ETHIOPIC		:= font-misc-ethiopic-$(XORG_FONT_MISC_ETHIOPIC_VERSION)
 XORG_FONT_MISC_ETHIOPIC_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_ETHIOPIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
+XORG_FONT_MISC_ETHIOPIC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
 XORG_FONT_MISC_ETHIOPIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
 XORG_FONT_MISC_ETHIOPIC_DIR	:= $(BUILDDIR)/$(XORG_FONT_MISC_ETHIOPIC)
 
diff --git a/rules/xorg-font-misc-meltho.make b/rules/xorg-font-misc-meltho.make
index e0fec3d59..30349046b 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MELTHO) += xorg-font-misc-meltho
 # Paths and names
 #
 XORG_FONT_MISC_MELTHO_VERSION	:= 1.0.0
-XORG_FONT_MISC_MELTHO		:= font-misc-meltho-X11R7.0-$(XORG_FONT_MISC_MELTHO_VERSION)
+XORG_FONT_MISC_MELTHO		:= font-misc-meltho-$(XORG_FONT_MISC_MELTHO_VERSION)
 XORG_FONT_MISC_MELTHO_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_MELTHO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
+XORG_FONT_MISC_MELTHO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
 XORG_FONT_MISC_MELTHO_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
 XORG_FONT_MISC_MELTHO_DIR	:= $(BUILDDIR)/$(XORG_FONT_MISC_MELTHO)
 
diff --git a/rules/xorg-font-misc-misc.make b/rules/xorg-font-misc-misc.make
index 713ccf8c1..f6ae9f684 100644
--- a/rules/xorg-font-misc-misc.make
+++ b/rules/xorg-font-misc-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MISC) += xorg-font-misc-misc
 # Paths and names
 #
 XORG_FONT_MISC_MISC_VERSION	:= 1.0.0
-XORG_FONT_MISC_MISC		:= font-misc-misc-X11R7.0-$(XORG_FONT_MISC_MISC_VERSION)
+XORG_FONT_MISC_MISC		:= font-misc-misc-$(XORG_FONT_MISC_MISC_VERSION)
 XORG_FONT_MISC_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
+XORG_FONT_MISC_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
 XORG_FONT_MISC_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
 XORG_FONT_MISC_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_MISC_MISC)
 
diff --git a/rules/xorg-font-mutt-misc.make b/rules/xorg-font-mutt-misc.make
index 7005df51a..b459e1275 100644
--- a/rules/xorg-font-mutt-misc.make
+++ b/rules/xorg-font-mutt-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_MUTT_MISC) += xorg-font-mutt-misc
 # Paths and names
 #
 XORG_FONT_MUTT_MISC_VERSION	:= 1.0.0
-XORG_FONT_MUTT_MISC		:= font-mutt-misc-X11R7.0-$(XORG_FONT_MUTT_MISC_VERSION)
+XORG_FONT_MUTT_MISC		:= font-mutt-misc-$(XORG_FONT_MUTT_MISC_VERSION)
 XORG_FONT_MUTT_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_MUTT_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
+XORG_FONT_MUTT_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
 XORG_FONT_MUTT_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
 XORG_FONT_MUTT_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_MUTT_MISC)
 
diff --git a/rules/xorg-font-schumacher-misc.make b/rules/xorg-font-schumacher-misc.make
index a4b2dfdc0..021a90632 100644
--- a/rules/xorg-font-schumacher-misc.make
+++ b/rules/xorg-font-schumacher-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCHUMACHER_MISC) += xorg-font-schumacher-misc
 # Paths and names
 #
 XORG_FONT_SCHUMACHER_MISC_VERSION	:= 1.0.0
-XORG_FONT_SCHUMACHER_MISC		:= font-schumacher-misc-X11R7.0-$(XORG_FONT_SCHUMACHER_MISC_VERSION)
+XORG_FONT_SCHUMACHER_MISC		:= font-schumacher-misc-$(XORG_FONT_SCHUMACHER_MISC_VERSION)
 XORG_FONT_SCHUMACHER_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_SCHUMACHER_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
+XORG_FONT_SCHUMACHER_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
 XORG_FONT_SCHUMACHER_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
 XORG_FONT_SCHUMACHER_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SCHUMACHER_MISC)
 
diff --git a/rules/xorg-font-screen-cyrillic.make b/rules/xorg-font-screen-cyrillic.make
index 90a27f7d5..8dc349674 100644
--- a/rules/xorg-font-screen-cyrillic.make
+++ b/rules/xorg-font-screen-cyrillic.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCREEN_CYRILLIC) += xorg-font-screen-cyrillic
 #
 # Paths and names
 #
-XORG_FONT_SCREEN_CYRILLIC_VERSION	:= 1.0.0
-XORG_FONT_SCREEN_CYRILLIC		:= font-screen-cyrillic-X11R7.0-$(XORG_FONT_SCREEN_CYRILLIC_VERSION)
+XORG_FONT_SCREEN_CYRILLIC_VERSION	:= 1.0.1
+XORG_FONT_SCREEN_CYRILLIC		:= font-screen-cyrillic-$(XORG_FONT_SCREEN_CYRILLIC_VERSION)
 XORG_FONT_SCREEN_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_SCREEN_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
+XORG_FONT_SCREEN_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
 XORG_FONT_SCREEN_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
 XORG_FONT_SCREEN_CYRILLIC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SCREEN_CYRILLIC)
 
diff --git a/rules/xorg-font-sony-misc.make b/rules/xorg-font-sony-misc.make
index 49e344d9b..e7d496e7d 100644
--- a/rules/xorg-font-sony-misc.make
+++ b/rules/xorg-font-sony-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_SONY_MISC) += xorg-font-sony-misc
 # Paths and names
 #
 XORG_FONT_SONY_MISC_VERSION	:= 1.0.0
-XORG_FONT_SONY_MISC		:= font-sony-misc-X11R7.0-$(XORG_FONT_SONY_MISC_VERSION)
+XORG_FONT_SONY_MISC		:= font-sony-misc-$(XORG_FONT_SONY_MISC_VERSION)
 XORG_FONT_SONY_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_SONY_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
+XORG_FONT_SONY_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
 XORG_FONT_SONY_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
 XORG_FONT_SONY_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SONY_MISC)
 
diff --git a/rules/xorg-font-sun-misc.make b/rules/xorg-font-sun-misc.make
index 8a0fe2435..bb7f5a2a3 100644
--- a/rules/xorg-font-sun-misc.make
+++ b/rules/xorg-font-sun-misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_SUN_MISC) += xorg-font-sun-misc
 # Paths and names
 #
 XORG_FONT_SUN_MISC_VERSION	:= 1.0.0
-XORG_FONT_SUN_MISC		:= font-sun-misc-X11R7.0-$(XORG_FONT_SUN_MISC_VERSION)
+XORG_FONT_SUN_MISC		:= font-sun-misc-$(XORG_FONT_SUN_MISC_VERSION)
 XORG_FONT_SUN_MISC_SUFFIX	:= tar.bz2
-XORG_FONT_SUN_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
+XORG_FONT_SUN_MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
 XORG_FONT_SUN_MISC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
 XORG_FONT_SUN_MISC_DIR		:= $(BUILDDIR)/$(XORG_FONT_SUN_MISC)
 
diff --git a/rules/xorg-font-util.make b/rules/xorg-font-util.make
index 044b8a709..bee5ba305 100644
--- a/rules/xorg-font-util.make
+++ b/rules/xorg-font-util.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_UTIL) += xorg-font-util
 # Paths and names
 #
 XORG_FONT_UTIL_VERSION	:= 1.0.1
-XORG_FONT_UTIL		:= font-util-X11R7.1-$(XORG_FONT_UTIL_VERSION)
+XORG_FONT_UTIL		:= font-util-$(XORG_FONT_UTIL_VERSION)
 XORG_FONT_UTIL_SUFFIX	:= tar.bz2
-XORG_FONT_UTIL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/font/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX)
+XORG_FONT_UTIL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX)
 XORG_FONT_UTIL_SOURCE	:= $(SRCDIR)/$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX)
 XORG_FONT_UTIL_DIR	:= $(BUILDDIR)/$(XORG_FONT_UTIL)
 
diff --git a/rules/xorg-font-winitzki-cyrillic.make b/rules/xorg-font-winitzki-cyrillic.make
index e880d8429..598c0d8b6 100644
--- a/rules/xorg-font-winitzki-cyrillic.make
+++ b/rules/xorg-font-winitzki-cyrillic.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_WINITZKI_CYRILLIC) += xorg-font-winitzki-cyrillic
 # Paths and names
 #
 XORG_FONT_WINITZKI_CYRILLIC_VERSION	:= 1.0.0
-XORG_FONT_WINITZKI_CYRILLIC		:= font-winitzki-cyrillic-X11R7.0-$(XORG_FONT_WINITZKI_CYRILLIC_VERSION)
+XORG_FONT_WINITZKI_CYRILLIC		:= font-winitzki-cyrillic-$(XORG_FONT_WINITZKI_CYRILLIC_VERSION)
 XORG_FONT_WINITZKI_CYRILLIC_SUFFIX	:= tar.bz2
-XORG_FONT_WINITZKI_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
+XORG_FONT_WINITZKI_CYRILLIC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
 XORG_FONT_WINITZKI_CYRILLIC_SOURCE	:= $(SRCDIR)/$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
 XORG_FONT_WINITZKI_CYRILLIC_DIR		:= $(BUILDDIR)/$(XORG_FONT_WINITZKI_CYRILLIC)
 
diff --git a/rules/xorg-font-xfree86-type1.make b/rules/xorg-font-xfree86-type1.make
index e49771b13..3f8ad71a8 100644
--- a/rules/xorg-font-xfree86-type1.make
+++ b/rules/xorg-font-xfree86-type1.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_FONT_XFREE86_TYPE1) += xorg-font-xfree86-type1
 # Paths and names
 #
 XORG_FONT_XFREE86_TYPE1_VERSION	:= 1.0.0
-XORG_FONT_XFREE86_TYPE1		:= font-xfree86-type1-X11R7.0-$(XORG_FONT_XFREE86_TYPE1_VERSION)
+XORG_FONT_XFREE86_TYPE1		:= font-xfree86-type1-$(XORG_FONT_XFREE86_TYPE1_VERSION)
 XORG_FONT_XFREE86_TYPE1_SUFFIX	:= tar.bz2
-XORG_FONT_XFREE86_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
+XORG_FONT_XFREE86_TYPE1_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/font/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
 XORG_FONT_XFREE86_TYPE1_SOURCE	:= $(SRCDIR)/$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
 XORG_FONT_XFREE86_TYPE1_DIR	:= $(BUILDDIR)/$(XORG_FONT_XFREE86_TYPE1)
 
diff --git a/rules/xorg-lib-AppleWM.make b/rules/xorg-lib-AppleWM.make
index 9c4e09de7..5dc241d44 100644
--- a/rules/xorg-lib-AppleWM.make
+++ b/rules/xorg-lib-AppleWM.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_APPLEWM) += xorg-lib-AppleWM
 # Paths and names
 #
 XORG_LIB_APPLEWM_VERSION	:= 1.0.0
-XORG_LIB_APPLEWM		:= libAppleWM-X11R7.0-$(XORG_LIB_APPLEWM_VERSION)
+XORG_LIB_APPLEWM		:= libAppleWM-$(XORG_LIB_APPLEWM_VERSION)
 XORG_LIB_APPLEWM_SUFFIX		:= tar.bz2
-XORG_LIB_APPLEWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX)
+XORG_LIB_APPLEWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX)
 XORG_LIB_APPLEWM_SOURCE		:= $(SRCDIR)/$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX)
 XORG_LIB_APPLEWM_DIR		:= $(BUILDDIR)/$(XORG_LIB_APPLEWM)
 
diff --git a/rules/xorg-lib-FS.make b/rules/xorg-lib-FS.make
index c241611ae..381ba67b3 100644
--- a/rules/xorg-lib-FS.make
+++ b/rules/xorg-lib-FS.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_FS) += xorg-lib-FS
 # Paths and names
 #
 XORG_LIB_FS_VERSION	:= 1.0.0
-XORG_LIB_FS		:= libFS-X11R7.0-$(XORG_LIB_FS_VERSION)
+XORG_LIB_FS		:= libFS-$(XORG_LIB_FS_VERSION)
 XORG_LIB_FS_SUFFIX	:= tar.bz2
-XORG_LIB_FS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX)
+XORG_LIB_FS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX)
 XORG_LIB_FS_SOURCE	:= $(SRCDIR)/$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX)
 XORG_LIB_FS_DIR		:= $(BUILDDIR)/$(XORG_LIB_FS)
 
diff --git a/rules/xorg-lib-ICE.make b/rules/xorg-lib-ICE.make
index 0ab8ece6d..9bab765a8 100644
--- a/rules/xorg-lib-ICE.make
+++ b/rules/xorg-lib-ICE.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_ICE) += xorg-lib-ICE
 #
 # Paths and names
 #
-XORG_LIB_ICE_VERSION	:= 1.0.1
-XORG_LIB_ICE		:= libICE-X11R7.1-$(XORG_LIB_ICE_VERSION)
+XORG_LIB_ICE_VERSION	:= 1.0.4
+XORG_LIB_ICE		:= libICE-$(XORG_LIB_ICE_VERSION)
 XORG_LIB_ICE_SUFFIX	:= tar.bz2
-XORG_LIB_ICE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX)
+XORG_LIB_ICE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX)
 XORG_LIB_ICE_SOURCE	:= $(SRCDIR)/$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX)
 XORG_LIB_ICE_DIR	:= $(BUILDDIR)/$(XORG_LIB_ICE)
 
diff --git a/rules/xorg-lib-SM.make b/rules/xorg-lib-SM.make
index 990121695..dbc2de587 100644
--- a/rules/xorg-lib-SM.make
+++ b/rules/xorg-lib-SM.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_SM) += xorg-lib-SM
 #
 # Paths and names
 #
-XORG_LIB_SM_VERSION	:= 1.0.1
-XORG_LIB_SM		:= libSM-X11R7.1-$(XORG_LIB_SM_VERSION)
+XORG_LIB_SM_VERSION	:= 1.0.3
+XORG_LIB_SM		:= libSM-$(XORG_LIB_SM_VERSION)
 XORG_LIB_SM_SUFFIX	:= tar.bz2
-XORG_LIB_SM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX)
+XORG_LIB_SM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX)
 XORG_LIB_SM_SOURCE	:= $(SRCDIR)/$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX)
 XORG_LIB_SM_DIR		:= $(BUILDDIR)/$(XORG_LIB_SM)
 
diff --git a/rules/xorg-lib-WindowsWM.make b/rules/xorg-lib-WindowsWM.make
index df86cd378..c0d23b2a3 100644
--- a/rules/xorg-lib-WindowsWM.make
+++ b/rules/xorg-lib-WindowsWM.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_WINDOWSWM) += xorg-lib-WindowsWM
 # Paths and names
 #
 XORG_LIB_WINDOWSWM_VERSION	:= 1.0.0
-XORG_LIB_WINDOWSWM		:= libWindowsWM-X11R7.0-$(XORG_LIB_WINDOWSWM_VERSION)
+XORG_LIB_WINDOWSWM		:= libWindowsWM-$(XORG_LIB_WINDOWSWM_VERSION)
 XORG_LIB_WINDOWSWM_SUFFIX	:= tar.bz2
-XORG_LIB_WINDOWSWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX)
+XORG_LIB_WINDOWSWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX)
 XORG_LIB_WINDOWSWM_SOURCE	:= $(SRCDIR)/$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX)
 XORG_LIB_WINDOWSWM_DIR		:= $(BUILDDIR)/$(XORG_LIB_WINDOWSWM)
 
diff --git a/rules/xorg-lib-X11.in b/rules/xorg-lib-X11.in
index 9f23f3636..af9e238ac 100644
--- a/rules/xorg-lib-X11.in
+++ b/rules/xorg-lib-X11.in
@@ -2,6 +2,7 @@ menuconfig XORG_LIB_X11
 	bool
 	prompt "libX11                "
 # always required:
+	select LIBXCB
 	select XORG_PROTO_X
 	select XORG_LIB_XAU
 	select XORG_PROTO_BIGREQS	# FIXME Why always?
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index 250a28d8e..a49e0b730 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_X11) += xorg-lib-X11
 #
 # Paths and names
 #
-XORG_LIB_X11_VERSION	:= 1.0.1
-XORG_LIB_X11		:= libX11-X11R7.1-$(XORG_LIB_X11_VERSION)
+XORG_LIB_X11_VERSION	:= 1.1.3
+XORG_LIB_X11		:= libX11-$(XORG_LIB_X11_VERSION)
 XORG_LIB_X11_SUFFIX	:= tar.bz2
-XORG_LIB_X11_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
+XORG_LIB_X11_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
 XORG_LIB_X11_SOURCE	:= $(SRCDIR)/$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
 XORG_LIB_X11_DIR	:= $(BUILDDIR)/$(XORG_LIB_X11)
 
diff --git a/rules/xorg-lib-XScrnSaver.make b/rules/xorg-lib-XScrnSaver.make
index 0745e2ab6..b7180f447 100644
--- a/rules/xorg-lib-XScrnSaver.make
+++ b/rules/xorg-lib-XScrnSaver.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XSCRNSAVER) += xorg-lib-XScrnSaver
 #
 # Paths and names
 #
-XORG_LIB_XSCRNSAVER_VERSION	:= 1.1.0
-XORG_LIB_XSCRNSAVER		:= libXScrnSaver-X11R7.1-$(XORG_LIB_XSCRNSAVER_VERSION)
+XORG_LIB_XSCRNSAVER_VERSION	:= 1.1.2
+XORG_LIB_XSCRNSAVER		:= libXScrnSaver-$(XORG_LIB_XSCRNSAVER_VERSION)
 XORG_LIB_XSCRNSAVER_SUFFIX	:= tar.bz2
-XORG_LIB_XSCRNSAVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX)
+XORG_LIB_XSCRNSAVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX)
 XORG_LIB_XSCRNSAVER_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX)
 XORG_LIB_XSCRNSAVER_DIR		:= $(BUILDDIR)/$(XORG_LIB_XSCRNSAVER)
 
diff --git a/rules/xorg-lib-XTrap.make b/rules/xorg-lib-XTrap.make
index fab9fb69c..9d704be2d 100644
--- a/rules/xorg-lib-XTrap.make
+++ b/rules/xorg-lib-XTrap.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRAP) += xorg-lib-XTrap
 # Paths and names
 #
 XORG_LIB_XTRAP_VERSION	:= 1.0.0
-XORG_LIB_XTRAP		:= libXTrap-X11R7.0-$(XORG_LIB_XTRAP_VERSION)
+XORG_LIB_XTRAP		:= libXTrap-$(XORG_LIB_XTRAP_VERSION)
 XORG_LIB_XTRAP_SUFFIX	:= tar.bz2
-XORG_LIB_XTRAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX)
+XORG_LIB_XTRAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX)
 XORG_LIB_XTRAP_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX)
 XORG_LIB_XTRAP_DIR	:= $(BUILDDIR)/$(XORG_LIB_XTRAP)
 
diff --git a/rules/xorg-lib-Xau.make b/rules/xorg-lib-Xau.make
index 5ab2dcbda..b1427d553 100644
--- a/rules/xorg-lib-Xau.make
+++ b/rules/xorg-lib-Xau.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XAU) += xorg-lib-Xau
 #
 # Paths and names
 #
-XORG_LIB_XAU_VERSION	:= 1.0.1
-XORG_LIB_XAU		:= libXau-X11R7.1-$(XORG_LIB_XAU_VERSION)
+XORG_LIB_XAU_VERSION	:= 1.0.3
+XORG_LIB_XAU		:= libXau-$(XORG_LIB_XAU_VERSION)
 XORG_LIB_XAU_SUFFIX	:= tar.bz2
-XORG_LIB_XAU_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX)
+XORG_LIB_XAU_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX)
 XORG_LIB_XAU_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX)
 XORG_LIB_XAU_DIR	:= $(BUILDDIR)/$(XORG_LIB_XAU)
 
diff --git a/rules/xorg-lib-Xaw.make b/rules/xorg-lib-Xaw.make
index d8c7a54bf..22ac17d57 100644
--- a/rules/xorg-lib-Xaw.make
+++ b/rules/xorg-lib-Xaw.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XAW) += xorg-lib-Xaw
 #
 # Paths and names
 #
-XORG_LIB_XAW_VERSION	:= 1.0.2
-XORG_LIB_XAW		:= libXaw-X11R7.1-$(XORG_LIB_XAW_VERSION)
+XORG_LIB_XAW_VERSION	:= 1.0.4
+XORG_LIB_XAW		:= libXaw-$(XORG_LIB_XAW_VERSION)
 XORG_LIB_XAW_SUFFIX	:= tar.bz2
-XORG_LIB_XAW_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX)
+XORG_LIB_XAW_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX)
 XORG_LIB_XAW_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX)
 XORG_LIB_XAW_DIR	:= $(BUILDDIR)/$(XORG_LIB_XAW)
 
diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make
index f7e184e44..d5e430aa8 100644
--- a/rules/xorg-lib-Xcomposite.make
+++ b/rules/xorg-lib-Xcomposite.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XCOMPOSITE) += xorg-lib-Xcomposite
 #
 # Paths and names
 #
-XORG_LIB_XCOMPOSITE_VERSION	:= 0.3
-XORG_LIB_XCOMPOSITE		:= libXcomposite-X11R7.1-$(XORG_LIB_XCOMPOSITE_VERSION)
+XORG_LIB_XCOMPOSITE_VERSION	:= 0.4.0
+XORG_LIB_XCOMPOSITE		:= libXcomposite-$(XORG_LIB_XCOMPOSITE_VERSION)
 XORG_LIB_XCOMPOSITE_SUFFIX	:= tar.bz2
-XORG_LIB_XCOMPOSITE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
+XORG_LIB_XCOMPOSITE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
 XORG_LIB_XCOMPOSITE_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
 XORG_LIB_XCOMPOSITE_DIR		:= $(BUILDDIR)/$(XORG_LIB_XCOMPOSITE)
 
diff --git a/rules/xorg-lib-Xcursor.make b/rules/xorg-lib-Xcursor.make
index eb23c0244..f9ad3341f 100644
--- a/rules/xorg-lib-Xcursor.make
+++ b/rules/xorg-lib-Xcursor.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XCURSOR) += xorg-lib-Xcursor
 #
 # Paths and names
 #
-XORG_LIB_XCURSOR_VERSION	:= 1.1.6
-XORG_LIB_XCURSOR		:= libXcursor-X11R7.1-$(XORG_LIB_XCURSOR_VERSION)
+XORG_LIB_XCURSOR_VERSION	:= 1.1.9
+XORG_LIB_XCURSOR		:= libXcursor-$(XORG_LIB_XCURSOR_VERSION)
 XORG_LIB_XCURSOR_SUFFIX		:= tar.bz2
-XORG_LIB_XCURSOR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX)
+XORG_LIB_XCURSOR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX)
 XORG_LIB_XCURSOR_SOURCE		:= $(SRCDIR)/$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX)
 XORG_LIB_XCURSOR_DIR		:= $(BUILDDIR)/$(XORG_LIB_XCURSOR)
 
diff --git a/rules/xorg-lib-Xdamage.make b/rules/xorg-lib-Xdamage.make
index dd7deb1ca..8fcc27f0f 100644
--- a/rules/xorg-lib-Xdamage.make
+++ b/rules/xorg-lib-Xdamage.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XDAMAGE) += xorg-lib-Xdamage
 #
 # Paths and names
 #
-XORG_LIB_XDAMAGE_VERSION	:= 1.0.3
-XORG_LIB_XDAMAGE		:= libXdamage-X11R7.1-$(XORG_LIB_XDAMAGE_VERSION)
+XORG_LIB_XDAMAGE_VERSION	:= 1.0.4
+XORG_LIB_XDAMAGE		:= libXdamage-$(XORG_LIB_XDAMAGE_VERSION)
 XORG_LIB_XDAMAGE_SUFFIX		:= tar.bz2
-XORG_LIB_XDAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
+XORG_LIB_XDAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
 XORG_LIB_XDAMAGE_SOURCE		:= $(SRCDIR)/$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
 XORG_LIB_XDAMAGE_DIR		:= $(BUILDDIR)/$(XORG_LIB_XDAMAGE)
 
diff --git a/rules/xorg-lib-Xdmcp.make b/rules/xorg-lib-Xdmcp.make
index b62e2d208..f89bcf177 100644
--- a/rules/xorg-lib-Xdmcp.make
+++ b/rules/xorg-lib-Xdmcp.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XDMCP) += xorg-lib-Xdmcp
 #
 # Paths and names
 #
-XORG_LIB_XDMCP_VERSION	:= 1.0.1
-XORG_LIB_XDMCP		:= libXdmcp-X11R7.1-$(XORG_LIB_XDMCP_VERSION)
+XORG_LIB_XDMCP_VERSION	:= 1.0.2
+XORG_LIB_XDMCP		:= libXdmcp-$(XORG_LIB_XDMCP_VERSION)
 XORG_LIB_XDMCP_SUFFIX	:= tar.bz2
-XORG_LIB_XDMCP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX)
+XORG_LIB_XDMCP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX)
 XORG_LIB_XDMCP_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX)
 XORG_LIB_XDMCP_DIR	:= $(BUILDDIR)/$(XORG_LIB_XDMCP)
 
diff --git a/rules/xorg-lib-Xevie.make b/rules/xorg-lib-Xevie.make
index e614bae97..33f25ac08 100644
--- a/rules/xorg-lib-Xevie.make
+++ b/rules/xorg-lib-Xevie.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XEVIE) += xorg-lib-Xevie
 #
 # Paths and names
 #
-XORG_LIB_XEVIE_VERSION	:= 1.0.1
-XORG_LIB_XEVIE		:= libXevie-X11R7.1-$(XORG_LIB_XEVIE_VERSION)
+XORG_LIB_XEVIE_VERSION	:= 1.0.2
+XORG_LIB_XEVIE		:= libXevie-$(XORG_LIB_XEVIE_VERSION)
 XORG_LIB_XEVIE_SUFFIX	:= tar.bz2
-XORG_LIB_XEVIE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX)
+XORG_LIB_XEVIE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX)
 XORG_LIB_XEVIE_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX)
 XORG_LIB_XEVIE_DIR	:= $(BUILDDIR)/$(XORG_LIB_XEVIE)
 
diff --git a/rules/xorg-lib-Xext.make b/rules/xorg-lib-Xext.make
index c6659e41a..48803c261 100644
--- a/rules/xorg-lib-Xext.make
+++ b/rules/xorg-lib-Xext.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XEXT) += xorg-lib-Xext
 #
 # Paths and names
 #
-XORG_LIB_XEXT_VERSION	:= 1.0.1
-XORG_LIB_XEXT		:= libXext-X11R7.1-$(XORG_LIB_XEXT_VERSION)
+XORG_LIB_XEXT_VERSION	:= 1.0.2
+XORG_LIB_XEXT		:= libXext-$(XORG_LIB_XEXT_VERSION)
 XORG_LIB_XEXT_SUFFIX	:= tar.bz2
-XORG_LIB_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
+XORG_LIB_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
 XORG_LIB_XEXT_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
 XORG_LIB_XEXT_DIR	:= $(BUILDDIR)/$(XORG_LIB_XEXT)
 
diff --git a/rules/xorg-lib-Xfixes.make b/rules/xorg-lib-Xfixes.make
index 32ab22728..4398da45e 100644
--- a/rules/xorg-lib-Xfixes.make
+++ b/rules/xorg-lib-Xfixes.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFIXES) += xorg-lib-Xfixes
 #
 # Paths and names
 #
-XORG_LIB_XFIXES_VERSION	:= 4.0.1
-XORG_LIB_XFIXES		:= libXfixes-X11R7.1-$(XORG_LIB_XFIXES_VERSION)
+XORG_LIB_XFIXES_VERSION	:= 4.0.3
+XORG_LIB_XFIXES		:= libXfixes-$(XORG_LIB_XFIXES_VERSION)
 XORG_LIB_XFIXES_SUFFIX	:= tar.bz2
-XORG_LIB_XFIXES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
+XORG_LIB_XFIXES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
 XORG_LIB_XFIXES_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
 XORG_LIB_XFIXES_DIR	:= $(BUILDDIR)/$(XORG_LIB_XFIXES)
 
diff --git a/rules/xorg-lib-Xfontcache.make b/rules/xorg-lib-Xfontcache.make
index ce824e2cf..c30e196d9 100644
--- a/rules/xorg-lib-Xfontcache.make
+++ b/rules/xorg-lib-Xfontcache.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFONTCACHE) += xorg-lib-Xfontcache
 #
 # Paths and names
 #
-XORG_LIB_XFONTCACHE_VERSION	:= 1.0.2
-XORG_LIB_XFONTCACHE		:= libXfontcache-X11R7.1-$(XORG_LIB_XFONTCACHE_VERSION)
+XORG_LIB_XFONTCACHE_VERSION	:= 1.0.4
+XORG_LIB_XFONTCACHE		:= libXfontcache-$(XORG_LIB_XFONTCACHE_VERSION)
 XORG_LIB_XFONTCACHE_SUFFIX	:= tar.bz2
-XORG_LIB_XFONTCACHE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX)
+XORG_LIB_XFONTCACHE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX)
 XORG_LIB_XFONTCACHE_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX)
 XORG_LIB_XFONTCACHE_DIR		:= $(BUILDDIR)/$(XORG_LIB_XFONTCACHE)
 
diff --git a/rules/xorg-lib-Xft.make b/rules/xorg-lib-Xft.make
index 5748683aa..146418e42 100644
--- a/rules/xorg-lib-Xft.make
+++ b/rules/xorg-lib-Xft.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFT) += xorg-lib-Xft
 #
 # Paths and names
 #
-XORG_LIB_XFT_VERSION	:= 2.1.8.2
-XORG_LIB_XFT		:= libXft-X11R7.0-$(XORG_LIB_XFT_VERSION)
+XORG_LIB_XFT_VERSION	:= 2.1.12
+XORG_LIB_XFT		:= libXft-$(XORG_LIB_XFT_VERSION)
 XORG_LIB_XFT_SUFFIX	:= tar.bz2
-XORG_LIB_XFT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX)
+XORG_LIB_XFT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX)
 XORG_LIB_XFT_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX)
 XORG_LIB_XFT_DIR	:= $(BUILDDIR)/$(XORG_LIB_XFT)
 
diff --git a/rules/xorg-lib-Xi.make b/rules/xorg-lib-Xi.make
index aaf7ec458..c9836fe25 100644
--- a/rules/xorg-lib-Xi.make
+++ b/rules/xorg-lib-Xi.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XI) += xorg-lib-Xi
 #
 # Paths and names
 #
-XORG_LIB_XI_VERSION	:= 1.0.1
-XORG_LIB_XI		:= libXi-X11R7.1-$(XORG_LIB_XI_VERSION)
+XORG_LIB_XI_VERSION	:= 1.1.3
+XORG_LIB_XI		:= libXi-$(XORG_LIB_XI_VERSION)
 XORG_LIB_XI_SUFFIX	:= tar.bz2
-XORG_LIB_XI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
+XORG_LIB_XI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
 XORG_LIB_XI_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
 XORG_LIB_XI_DIR		:= $(BUILDDIR)/$(XORG_LIB_XI)
 
diff --git a/rules/xorg-lib-Xinerama.make b/rules/xorg-lib-Xinerama.make
index 2ba8bd530..b582f8565 100644
--- a/rules/xorg-lib-Xinerama.make
+++ b/rules/xorg-lib-Xinerama.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XINERAMA) += xorg-lib-Xinerama
 #
 # Paths and names
 #
-XORG_LIB_XINERAMA_VERSION	:= 1.0.1
-XORG_LIB_XINERAMA		:= libXinerama-X11R7.0-$(XORG_LIB_XINERAMA_VERSION)
+XORG_LIB_XINERAMA_VERSION	:= 1.0.2
+XORG_LIB_XINERAMA		:= libXinerama-$(XORG_LIB_XINERAMA_VERSION)
 XORG_LIB_XINERAMA_SUFFIX	:= tar.bz2
-XORG_LIB_XINERAMA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX)
+XORG_LIB_XINERAMA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX)
 XORG_LIB_XINERAMA_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX)
 XORG_LIB_XINERAMA_DIR		:= $(BUILDDIR)/$(XORG_LIB_XINERAMA)
 
diff --git a/rules/xorg-lib-Xmu.make b/rules/xorg-lib-Xmu.make
index 54483a1ae..6d2b4f358 100644
--- a/rules/xorg-lib-Xmu.make
+++ b/rules/xorg-lib-Xmu.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XMU) += xorg-lib-Xmu
 #
 # Paths and names
 #
-XORG_LIB_XMU_VERSION	:= 1.0.1
-XORG_LIB_XMU		:= libXmu-X11R7.1-$(XORG_LIB_XMU_VERSION)
+XORG_LIB_XMU_VERSION	:= 1.0.3
+XORG_LIB_XMU		:= libXmu-$(XORG_LIB_XMU_VERSION)
 XORG_LIB_XMU_SUFFIX	:= tar.bz2
-XORG_LIB_XMU_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX)
+XORG_LIB_XMU_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX)
 XORG_LIB_XMU_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX)
 XORG_LIB_XMU_DIR	:= $(BUILDDIR)/$(XORG_LIB_XMU)
 
diff --git a/rules/xorg-lib-Xp.make b/rules/xorg-lib-Xp.make
index d3865728e..3cfc9ef43 100644
--- a/rules/xorg-lib-Xp.make
+++ b/rules/xorg-lib-Xp.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XP) += xorg-lib-Xp
 # Paths and names
 #
 XORG_LIB_XP_VERSION	:= 1.0.0
-XORG_LIB_XP		:= libXp-X11R7.0-$(XORG_LIB_XP_VERSION)
+XORG_LIB_XP		:= libXp-$(XORG_LIB_XP_VERSION)
 XORG_LIB_XP_SUFFIX	:= tar.bz2
-XORG_LIB_XP_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX)
+XORG_LIB_XP_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX)
 XORG_LIB_XP_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX)
 XORG_LIB_XP_DIR		:= $(BUILDDIR)/$(XORG_LIB_XP)
 
diff --git a/rules/xorg-lib-Xpm.make b/rules/xorg-lib-Xpm.make
index f9a4379bf..56216e5d1 100644
--- a/rules/xorg-lib-Xpm.make
+++ b/rules/xorg-lib-Xpm.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPM) += xorg-lib-Xpm
 #
 # Paths and names
 #
-XORG_LIB_XPM_VERSION	:= 3.5.5
-XORG_LIB_XPM		:= libXpm-X11R7.1-$(XORG_LIB_XPM_VERSION)
+XORG_LIB_XPM_VERSION	:= 3.5.7
+XORG_LIB_XPM		:= libXpm-$(XORG_LIB_XPM_VERSION)
 XORG_LIB_XPM_SUFFIX	:= tar.bz2
-XORG_LIB_XPM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX)
+XORG_LIB_XPM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX)
 XORG_LIB_XPM_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX)
 XORG_LIB_XPM_DIR	:= $(BUILDDIR)/$(XORG_LIB_XPM)
 
diff --git a/rules/xorg-lib-XprintAppUtil.make b/rules/xorg-lib-XprintAppUtil.make
index 205fa8c6d..129b4d853 100644
--- a/rules/xorg-lib-XprintAppUtil.make
+++ b/rules/xorg-lib-XprintAppUtil.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPRINTAPPUTIL) += xorg-lib-XprintAppUtil
 # Paths and names
 #
 XORG_LIB_XPRINTAPPUTIL_VERSION	:= 1.0.1
-XORG_LIB_XPRINTAPPUTIL		:= libXprintAppUtil-X11R7.0-$(XORG_LIB_XPRINTAPPUTIL_VERSION)
+XORG_LIB_XPRINTAPPUTIL		:= libXprintAppUtil-$(XORG_LIB_XPRINTAPPUTIL_VERSION)
 XORG_LIB_XPRINTAPPUTIL_SUFFIX	:= tar.bz2
-XORG_LIB_XPRINTAPPUTIL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX)
+XORG_LIB_XPRINTAPPUTIL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX)
 XORG_LIB_XPRINTAPPUTIL_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX)
 XORG_LIB_XPRINTAPPUTIL_DIR	:= $(BUILDDIR)/$(XORG_LIB_XPRINTAPPUTIL)
 
diff --git a/rules/xorg-lib-XprintUtil.make b/rules/xorg-lib-XprintUtil.make
index 10b4c3eb7..e0f2bd93e 100644
--- a/rules/xorg-lib-XprintUtil.make
+++ b/rules/xorg-lib-XprintUtil.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPRINTUTIL) += xorg-lib-XprintUtil
 # Paths and names
 #
 XORG_LIB_XPRINTUTIL_VERSION	:= 1.0.1
-XORG_LIB_XPRINTUTIL		:= libXprintUtil-X11R7.0-$(XORG_LIB_XPRINTUTIL_VERSION)
+XORG_LIB_XPRINTUTIL		:= libXprintUtil-$(XORG_LIB_XPRINTUTIL_VERSION)
 XORG_LIB_XPRINTUTIL_SUFFIX	:= tar.bz2
-XORG_LIB_XPRINTUTIL_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX)
+XORG_LIB_XPRINTUTIL_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX)
 XORG_LIB_XPRINTUTIL_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX)
 XORG_LIB_XPRINTUTIL_DIR		:= $(BUILDDIR)/$(XORG_LIB_XPRINTUTIL)
 
diff --git a/rules/xorg-lib-Xrandr.make b/rules/xorg-lib-Xrandr.make
index 595606638..d9b7932df 100644
--- a/rules/xorg-lib-Xrandr.make
+++ b/rules/xorg-lib-Xrandr.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRANDR) += xorg-lib-Xrandr
 #
 # Paths and names
 #
-XORG_LIB_XRANDR_VERSION	:= 1.1.1
-XORG_LIB_XRANDR		:= libXrandr-X11R7.1-$(XORG_LIB_XRANDR_VERSION)
+XORG_LIB_XRANDR_VERSION	:= 1.2.2
+XORG_LIB_XRANDR		:= libXrandr-$(XORG_LIB_XRANDR_VERSION)
 XORG_LIB_XRANDR_SUFFIX	:= tar.bz2
-XORG_LIB_XRANDR_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX)
+XORG_LIB_XRANDR_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX)
 XORG_LIB_XRANDR_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX)
 XORG_LIB_XRANDR_DIR	:= $(BUILDDIR)/$(XORG_LIB_XRANDR)
 
@@ -116,15 +116,15 @@ $(STATEDIR)/xorg-lib-Xrandr.targetinstall: $(xorg-lib-Xrandr_targetinstall_deps_
 	@$(call install_fixup, xorg-lib-Xrandr,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-lib-Xrandr, 0, 0, 0644, \
-		$(XORG_LIB_XRANDR_DIR)/src/.libs/libXrandr.so.2.0.0, \
-		$(XORG_LIBDIR)/libXrandr.so.2.0.0)
+		$(XORG_LIB_XRANDR_DIR)/src/.libs/libXrandr.so.2.1.0, \
+		$(XORG_LIBDIR)/libXrandr.so.2.1.0)
 
 	@$(call install_link, xorg-lib-Xrandr, \
-		libXrandr.so.2.0.0, \
+		libXrandr.so.2.1.0, \
 		$(XORG_LIBDIR)/libXrandr.so.2)
 
 	@$(call install_link, xorg-lib-Xrandr, \
-		libXrandr.so.2.0.0, \
+		libXrandr.so.2.1.0, \
 		$(XORG_LIBDIR)/libXrandr.so)
 
 	@$(call install_finish, xorg-lib-Xrandr)
diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
index dfa9874fd..aa4008e31 100644
--- a/rules/xorg-lib-Xrender.make
+++ b/rules/xorg-lib-Xrender.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRENDER) += xorg-lib-Xrender
 #
 # Paths and names
 #
-XORG_LIB_XRENDER_VERSION	:= 0.9.1
-XORG_LIB_XRENDER		:= libXrender-X11R7.1-$(XORG_LIB_XRENDER_VERSION)
+XORG_LIB_XRENDER_VERSION	:= 0.9.4
+XORG_LIB_XRENDER		:= libXrender-$(XORG_LIB_XRENDER_VERSION)
 XORG_LIB_XRENDER_SUFFIX		:= tar.bz2
-XORG_LIB_XRENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
+XORG_LIB_XRENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
 XORG_LIB_XRENDER_SOURCE		:= $(SRCDIR)/$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
 XORG_LIB_XRENDER_DIR		:= $(BUILDDIR)/$(XORG_LIB_XRENDER)
 
diff --git a/rules/xorg-lib-Xres.make b/rules/xorg-lib-Xres.make
index 06667c480..5cf08d9a8 100644
--- a/rules/xorg-lib-Xres.make
+++ b/rules/xorg-lib-Xres.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XRES) += xorg-lib-Xres
 #
 # Paths and names
 #
-XORG_LIB_XRES_VERSION	:= 1.0.1
-XORG_LIB_XRES		:= libXres-X11R7.1-$(XORG_LIB_XRES_VERSION)
+XORG_LIB_XRES_VERSION	:= 1.0.3
+XORG_LIB_XRES		:= libXres-$(XORG_LIB_XRES_VERSION)
 XORG_LIB_XRES_SUFFIX	:= tar.bz2
-XORG_LIB_XRES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX)
+XORG_LIB_XRES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX)
 XORG_LIB_XRES_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX)
 XORG_LIB_XRES_DIR	:= $(BUILDDIR)/$(XORG_LIB_XRES)
 
diff --git a/rules/xorg-lib-Xt.make b/rules/xorg-lib-Xt.make
index 330a5be02..e65683f20 100644
--- a/rules/xorg-lib-Xt.make
+++ b/rules/xorg-lib-Xt.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XT) += xorg-lib-Xt
 #
 # Paths and names
 #
-XORG_LIB_XT_VERSION	:= 1.0.2
-XORG_LIB_XT		:= libXt-X11R7.1-$(XORG_LIB_XT_VERSION)
+XORG_LIB_XT_VERSION	:= 1.0.4
+XORG_LIB_XT		:= libXt-$(XORG_LIB_XT_VERSION)
 XORG_LIB_XT_SUFFIX	:= tar.bz2
-XORG_LIB_XT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
+XORG_LIB_XT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
 XORG_LIB_XT_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
 XORG_LIB_XT_DIR		:= $(BUILDDIR)/$(XORG_LIB_XT)
 
diff --git a/rules/xorg-lib-Xtst.make b/rules/xorg-lib-Xtst.make
index 4401ef80a..a5be899f1 100644
--- a/rules/xorg-lib-Xtst.make
+++ b/rules/xorg-lib-Xtst.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTST) += xorg-lib-Xtst
 #
 # Paths and names
 #
-XORG_LIB_XTST_VERSION	:= 1.0.1
-XORG_LIB_XTST		:= libXtst-X11R7.0-$(XORG_LIB_XTST_VERSION)
+XORG_LIB_XTST_VERSION	:= 1.0.3
+XORG_LIB_XTST		:= libXtst-$(XORG_LIB_XTST_VERSION)
 XORG_LIB_XTST_SUFFIX	:= tar.bz2
-XORG_LIB_XTST_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX)
+XORG_LIB_XTST_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX)
 XORG_LIB_XTST_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX)
 XORG_LIB_XTST_DIR	:= $(BUILDDIR)/$(XORG_LIB_XTST)
 
diff --git a/rules/xorg-lib-Xv.make b/rules/xorg-lib-Xv.make
index 59b65945e..c0d6407fa 100644
--- a/rules/xorg-lib-Xv.make
+++ b/rules/xorg-lib-Xv.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XV) += xorg-lib-Xv
 #
 # Paths and names
 #
-XORG_LIB_XV_VERSION	:= 1.0.1
-XORG_LIB_XV		:= libXv-X11R7.0-$(XORG_LIB_XV_VERSION)
+XORG_LIB_XV_VERSION	:= 1.0.3
+XORG_LIB_XV		:= libXv-$(XORG_LIB_XV_VERSION)
 XORG_LIB_XV_SUFFIX	:= tar.bz2
-XORG_LIB_XV_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib//$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX)
+XORG_LIB_XV_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX)
 XORG_LIB_XV_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX)
 XORG_LIB_XV_DIR		:= $(BUILDDIR)/$(XORG_LIB_XV)
 
diff --git a/rules/xorg-lib-XvMC.make b/rules/xorg-lib-XvMC.make
index b4865a672..0f22fc7d5 100644
--- a/rules/xorg-lib-XvMC.make
+++ b/rules/xorg-lib-XvMC.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XVMC) += xorg-lib-XvMC
 #
 # Paths and names
 #
-XORG_LIB_XVMC_VERSION	:= 1.0.2
-XORG_LIB_XVMC		:= libXvMC-X11R7.1-$(XORG_LIB_XVMC_VERSION)
+XORG_LIB_XVMC_VERSION	:= 1.0.4
+XORG_LIB_XVMC		:= libXvMC-$(XORG_LIB_XVMC_VERSION)
 XORG_LIB_XVMC_SUFFIX	:= tar.bz2
-XORG_LIB_XVMC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX)
+XORG_LIB_XVMC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX)
 XORG_LIB_XVMC_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX)
 XORG_LIB_XVMC_DIR	:= $(BUILDDIR)/$(XORG_LIB_XVMC)
 
diff --git a/rules/xorg-lib-Xxf86dga.make b/rules/xorg-lib-Xxf86dga.make
index a5f658319..2d5c11a11 100644
--- a/rules/xorg-lib-Xxf86dga.make
+++ b/rules/xorg-lib-Xxf86dga.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86DGA) += xorg-lib-Xxf86dga
 #
 # Paths and names
 #
-XORG_LIB_XXF86DGA_VERSION	:= 1.0.1
-XORG_LIB_XXF86DGA		:= libXxf86dga-X11R7.1-$(XORG_LIB_XXF86DGA_VERSION)
+XORG_LIB_XXF86DGA_VERSION	:= 1.0.2
+XORG_LIB_XXF86DGA		:= libXxf86dga-$(XORG_LIB_XXF86DGA_VERSION)
 XORG_LIB_XXF86DGA_SUFFIX	:= tar.bz2
-XORG_LIB_XXF86DGA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX)
+XORG_LIB_XXF86DGA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX)
 XORG_LIB_XXF86DGA_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX)
 XORG_LIB_XXF86DGA_DIR		:= $(BUILDDIR)/$(XORG_LIB_XXF86DGA)
 
diff --git a/rules/xorg-lib-Xxf86misc.make b/rules/xorg-lib-Xxf86misc.make
index 8f3077e48..b0a276fdd 100644
--- a/rules/xorg-lib-Xxf86misc.make
+++ b/rules/xorg-lib-Xxf86misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86MISC) += xorg-lib-Xxf86misc
 # Paths and names
 #
 XORG_LIB_XXF86MISC_VERSION	:= 1.0.1
-XORG_LIB_XXF86MISC		:= libXxf86misc-X11R7.1-$(XORG_LIB_XXF86MISC_VERSION)
+XORG_LIB_XXF86MISC		:= libXxf86misc-$(XORG_LIB_XXF86MISC_VERSION)
 XORG_LIB_XXF86MISC_SUFFIX	:= tar.bz2
-XORG_LIB_XXF86MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX)
+XORG_LIB_XXF86MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX)
 XORG_LIB_XXF86MISC_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX)
 XORG_LIB_XXF86MISC_DIR		:= $(BUILDDIR)/$(XORG_LIB_XXF86MISC)
 
diff --git a/rules/xorg-lib-Xxf86vm.make b/rules/xorg-lib-Xxf86vm.make
index ce9b18974..555d17cec 100644
--- a/rules/xorg-lib-Xxf86vm.make
+++ b/rules/xorg-lib-Xxf86vm.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86VM) += xorg-lib-Xxf86vm
 # Paths and names
 #
 XORG_LIB_XXF86VM_VERSION	:= 1.0.1
-XORG_LIB_XXF86VM		:= libXxf86vm-X11R7.1-$(XORG_LIB_XXF86VM_VERSION)
+XORG_LIB_XXF86VM		:= libXxf86vm-$(XORG_LIB_XXF86VM_VERSION)
 XORG_LIB_XXF86VM_SUFFIX		:= tar.bz2
-XORG_LIB_XXF86VM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX)
+XORG_LIB_XXF86VM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX)
 XORG_LIB_XXF86VM_SOURCE		:= $(SRCDIR)/$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX)
 XORG_LIB_XXF86VM_DIR		:= $(BUILDDIR)/$(XORG_LIB_XXF86VM)
 
diff --git a/rules/xorg-lib-dmx.make b/rules/xorg-lib-dmx.make
index bddec0be0..80b95a50b 100644
--- a/rules/xorg-lib-dmx.make
+++ b/rules/xorg-lib-dmx.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_DMX) += xorg-lib-dmx
 # Paths and names
 #
 XORG_LIB_DMX_VERSION	:= 1.0.2
-XORG_LIB_DMX		:= libdmx-X11R7.1-$(XORG_LIB_DMX_VERSION)
+XORG_LIB_DMX		:= libdmx-$(XORG_LIB_DMX_VERSION)
 XORG_LIB_DMX_SUFFIX	:= tar.bz2
-XORG_LIB_DMX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX)
+XORG_LIB_DMX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX)
 XORG_LIB_DMX_SOURCE	:= $(SRCDIR)/$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX)
 XORG_LIB_DMX_DIR	:= $(BUILDDIR)/$(XORG_LIB_DMX)
 
diff --git a/rules/xorg-lib-fontenc.make b/rules/xorg-lib-fontenc.make
index e0c9fd53d..475564f46 100644
--- a/rules/xorg-lib-fontenc.make
+++ b/rules/xorg-lib-fontenc.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_FONTENC) += xorg-lib-fontenc
 #
 # Paths and names
 #
-XORG_LIB_FONTENC_VERSION	:= 1.0.2
-XORG_LIB_FONTENC		:= libfontenc-X11R7.1-$(XORG_LIB_FONTENC_VERSION)
+XORG_LIB_FONTENC_VERSION	:= 1.0.4
+XORG_LIB_FONTENC		:= libfontenc-$(XORG_LIB_FONTENC_VERSION)
 XORG_LIB_FONTENC_SUFFIX		:= tar.bz2
-XORG_LIB_FONTENC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX)
+XORG_LIB_FONTENC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX)
 XORG_LIB_FONTENC_SOURCE		:= $(SRCDIR)/$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX)
 XORG_LIB_FONTENC_DIR		:= $(BUILDDIR)/$(XORG_LIB_FONTENC)
 
diff --git a/rules/xorg-lib-lbxutil.make b/rules/xorg-lib-lbxutil.make
index 174df242c..8acb0674b 100644
--- a/rules/xorg-lib-lbxutil.make
+++ b/rules/xorg-lib-lbxutil.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_LBXUTIL) += xorg-lib-lbxutil
 # Paths and names
 #
 XORG_LIB_LBXUTIL_VERSION	:= 1.0.1
-XORG_LIB_LBXUTIL		:= liblbxutil-X11R7.1-$(XORG_LIB_LBXUTIL_VERSION)
+XORG_LIB_LBXUTIL		:= liblbxutil-$(XORG_LIB_LBXUTIL_VERSION)
 XORG_LIB_LBXUTIL_SUFFIX		:= tar.bz2
-XORG_LIB_LBXUTIL_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX)
+XORG_LIB_LBXUTIL_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX)
 XORG_LIB_LBXUTIL_SOURCE		:= $(SRCDIR)/$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX)
 XORG_LIB_LBXUTIL_DIR		:= $(BUILDDIR)/$(XORG_LIB_LBXUTIL)
 
diff --git a/rules/xorg-lib-oldX.make b/rules/xorg-lib-oldX.make
index c03e58aff..2751be465 100644
--- a/rules/xorg-lib-oldX.make
+++ b/rules/xorg-lib-oldX.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_OLDX) += xorg-lib-oldX
 # Paths and names
 #
 XORG_LIB_OLDX_VERSION	:= 1.0.1
-XORG_LIB_OLDX		:= liboldX-X11R7.0-$(XORG_LIB_OLDX_VERSION)
+XORG_LIB_OLDX		:= liboldX-$(XORG_LIB_OLDX_VERSION)
 XORG_LIB_OLDX_SUFFIX	:= tar.bz2
-XORG_LIB_OLDX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX)
+XORG_LIB_OLDX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX)
 XORG_LIB_OLDX_SOURCE	:= $(SRCDIR)/$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX)
 XORG_LIB_OLDX_DIR	:= $(BUILDDIR)/$(XORG_LIB_OLDX)
 
diff --git a/rules/xorg-lib-xkbfile.make b/rules/xorg-lib-xkbfile.make
index e73ed1b9b..8a171e870 100644
--- a/rules/xorg-lib-xkbfile.make
+++ b/rules/xorg-lib-xkbfile.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XKBFILE) += xorg-lib-xkbfile
 #
 # Paths and names
 #
-XORG_LIB_XKBFILE_VERSION	:= 1.0.3
-XORG_LIB_XKBFILE		:= libxkbfile-X11R7.1-$(XORG_LIB_XKBFILE_VERSION)
+XORG_LIB_XKBFILE_VERSION	:= 1.0.4
+XORG_LIB_XKBFILE		:= libxkbfile-$(XORG_LIB_XKBFILE_VERSION)
 XORG_LIB_XKBFILE_SUFFIX		:= tar.bz2
-XORG_LIB_XKBFILE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX)
+XORG_LIB_XKBFILE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX)
 XORG_LIB_XKBFILE_SOURCE		:= $(SRCDIR)/$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX)
 XORG_LIB_XKBFILE_DIR		:= $(BUILDDIR)/$(XORG_LIB_XKBFILE)
 
diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make
index 1ff036650..52054376e 100644
--- a/rules/xorg-lib-xkbui.make
+++ b/rules/xorg-lib-xkbui.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_LIB_XKBUI) += xorg-lib-xkbui
 # Paths and names
 #
 XORG_LIB_XKBUI_VERSION	:= 1.0.2
-XORG_LIB_XKBUI		:= libxkbui-X11R7.1-$(XORG_LIB_XKBUI_VERSION)
+XORG_LIB_XKBUI		:= libxkbui-$(XORG_LIB_XKBUI_VERSION)
 XORG_LIB_XKBUI_SUFFIX	:= tar.bz2
-XORG_LIB_XKBUI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX)
+XORG_LIB_XKBUI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX)
 XORG_LIB_XKBUI_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX)
 XORG_LIB_XKBUI_DIR	:= $(BUILDDIR)/$(XORG_LIB_XKBUI)
 
diff --git a/rules/xorg-lib-xtrans.make b/rules/xorg-lib-xtrans.make
index 41382de8d..954fb8465 100644
--- a/rules/xorg-lib-xtrans.make
+++ b/rules/xorg-lib-xtrans.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRANS) += xorg-lib-xtrans
 #
 # Paths and names
 #
-XORG_LIB_XTRANS_VERSION	:= 1.0.0
-XORG_LIB_XTRANS		:= xtrans-X11R7.0-$(XORG_LIB_XTRANS_VERSION)
+XORG_LIB_XTRANS_VERSION	:= 1.0.4
+XORG_LIB_XTRANS		:= xtrans-$(XORG_LIB_XTRANS_VERSION)
 XORG_LIB_XTRANS_SUFFIX	:= tar.bz2
-XORG_LIB_XTRANS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX)
+XORG_LIB_XTRANS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/lib/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX)
 XORG_LIB_XTRANS_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX)
 XORG_LIB_XTRANS_DIR	:= $(BUILDDIR)/$(XORG_LIB_XTRANS)
 
diff --git a/rules/xorg-lib.in b/rules/xorg-lib.in
index db73a8b06..9aa0cb24c 100644
--- a/rules/xorg-lib.in
+++ b/rules/xorg-lib.in
@@ -2,6 +2,9 @@
 
 menu "xorg libs             "
 
+source "rules/pixman.in"
+source "rules/libpthread-stubs.in"
+source "rules/libxcb.in"
 source "rules/xorg-lib-AppleWM.in"
 source "rules/xorg-lib-FS.in"
 source "rules/xorg-lib-ICE.in"
diff --git a/rules/xorg-proto-applewm.make b/rules/xorg-proto-applewm.make
index 1424b6984..d65e205d5 100644
--- a/rules/xorg-proto-applewm.make
+++ b/rules/xorg-proto-applewm.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_APPLEWM) += xorg-proto-applewm
 # Paths and names
 #
 XORG_PROTO_APPLEWM_VERSION	:= 1.0.3
-XORG_PROTO_APPLEWM		:= applewmproto-X11R7.0-$(XORG_PROTO_APPLEWM_VERSION)
+XORG_PROTO_APPLEWM		:= applewmproto-$(XORG_PROTO_APPLEWM_VERSION)
 XORG_PROTO_APPLEWM_SUFFIX	:= tar.bz2
-XORG_PROTO_APPLEWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX)
+XORG_PROTO_APPLEWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX)
 XORG_PROTO_APPLEWM_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX)
 XORG_PROTO_APPLEWM_DIR		:= $(BUILDDIR)/$(XORG_PROTO_APPLEWM)
 
diff --git a/rules/xorg-proto-bigreqs.make b/rules/xorg-proto-bigreqs.make
index 29423c9c6..a85c6a7b5 100644
--- a/rules/xorg-proto-bigreqs.make
+++ b/rules/xorg-proto-bigreqs.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_BIGREQS) += xorg-proto-bigreqs
 # Paths and names
 #
 XORG_PROTO_BIGREQS_VERSION	:= 1.0.2
-XORG_PROTO_BIGREQS		:= bigreqsproto-X11R7.0-$(XORG_PROTO_BIGREQS_VERSION)
+XORG_PROTO_BIGREQS		:= bigreqsproto-$(XORG_PROTO_BIGREQS_VERSION)
 XORG_PROTO_BIGREQS_SUFFIX	:= tar.bz2
-XORG_PROTO_BIGREQS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
+XORG_PROTO_BIGREQS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
 XORG_PROTO_BIGREQS_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
 XORG_PROTO_BIGREQS_DIR		:= $(BUILDDIR)/$(XORG_PROTO_BIGREQS)
 
diff --git a/rules/xorg-proto-composite.make b/rules/xorg-proto-composite.make
index 622455d4d..77a6fdc95 100644
--- a/rules/xorg-proto-composite.make
+++ b/rules/xorg-proto-composite.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_COMPOSITE) += xorg-proto-composite
 #
 # Paths and names
 #
-XORG_PROTO_COMPOSITE_VERSION 	:= 0.3.1
-XORG_PROTO_COMPOSITE		:= compositeproto-X11R7.1-$(XORG_PROTO_COMPOSITE_VERSION)
+XORG_PROTO_COMPOSITE_VERSION 	:= 0.4
+XORG_PROTO_COMPOSITE		:= compositeproto-$(XORG_PROTO_COMPOSITE_VERSION)
 XORG_PROTO_COMPOSITE_SUFFIX	:= tar.bz2
-XORG_PROTO_COMPOSITE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
+XORG_PROTO_COMPOSITE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
 XORG_PROTO_COMPOSITE_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
 XORG_PROTO_COMPOSITE_DIR	:= $(BUILDDIR)/$(XORG_PROTO_COMPOSITE)
 
diff --git a/rules/xorg-proto-damage.make b/rules/xorg-proto-damage.make
index 37c6ab05c..f87238455 100644
--- a/rules/xorg-proto-damage.make
+++ b/rules/xorg-proto-damage.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_DAMAGE) += xorg-proto-damage
 #
 # Paths and names
 #
-XORG_PROTO_DAMAGE_VERSION	:= 1.0.3
-XORG_PROTO_DAMAGE		:= damageproto-X11R7.0-$(XORG_PROTO_DAMAGE_VERSION)
+XORG_PROTO_DAMAGE_VERSION	:= 1.1.0
+XORG_PROTO_DAMAGE		:= damageproto-$(XORG_PROTO_DAMAGE_VERSION)
 XORG_PROTO_DAMAGE_SUFFIX	:= tar.bz2
-XORG_PROTO_DAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
+XORG_PROTO_DAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
 XORG_PROTO_DAMAGE_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
 XORG_PROTO_DAMAGE_DIR		:= $(BUILDDIR)/$(XORG_PROTO_DAMAGE)
 
diff --git a/rules/xorg-proto-dmx.make b/rules/xorg-proto-dmx.make
index f1059e7c2..ed6609d73 100644
--- a/rules/xorg-proto-dmx.make
+++ b/rules/xorg-proto-dmx.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_DMX) += xorg-proto-dmx
 # Paths and names
 #
 XORG_PROTO_DMX_VERSION	:= 2.2.2
-XORG_PROTO_DMX		:= dmxproto-X11R7.0-$(XORG_PROTO_DMX_VERSION)
+XORG_PROTO_DMX		:= dmxproto-$(XORG_PROTO_DMX_VERSION)
 XORG_PROTO_DMX_SUFFIX	:= tar.bz2
-XORG_PROTO_DMX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
+XORG_PROTO_DMX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
 XORG_PROTO_DMX_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
 XORG_PROTO_DMX_DIR	:= $(BUILDDIR)/$(XORG_PROTO_DMX)
 
diff --git a/rules/xorg-proto-evieext.make b/rules/xorg-proto-evieext.make
index 1210e47df..95ed3ed52 100644
--- a/rules/xorg-proto-evieext.make
+++ b/rules/xorg-proto-evieext.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_EVIEEXT) += xorg-proto-evieext
 # Paths and names
 #
 XORG_PROTO_EVIEEXT_VERSION	:= 1.0.2
-XORG_PROTO_EVIEEXT		:= evieext-X11R7.0-$(XORG_PROTO_EVIEEXT_VERSION)
+XORG_PROTO_EVIEEXT		:= evieext-$(XORG_PROTO_EVIEEXT_VERSION)
 XORG_PROTO_EVIEEXT_SUFFIX	:= tar.bz2
-XORG_PROTO_EVIEEXT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
+XORG_PROTO_EVIEEXT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
 XORG_PROTO_EVIEEXT_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
 XORG_PROTO_EVIEEXT_DIR		:= $(BUILDDIR)/$(XORG_PROTO_EVIEEXT)
 
diff --git a/rules/xorg-proto-fixes.make b/rules/xorg-proto-fixes.make
index 5e7ea3b68..62fd54dda 100644
--- a/rules/xorg-proto-fixes.make
+++ b/rules/xorg-proto-fixes.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FIXES) += xorg-proto-fixes
 # Paths and names
 #
 XORG_PROTO_FIXES_VERSION	:= 4.0
-XORG_PROTO_FIXES		:= fixesproto-X11R7.1-$(XORG_PROTO_FIXES_VERSION)
+XORG_PROTO_FIXES		:= fixesproto-$(XORG_PROTO_FIXES_VERSION)
 XORG_PROTO_FIXES_SUFFIX		:= tar.bz2
-XORG_PROTO_FIXES_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
+XORG_PROTO_FIXES_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
 XORG_PROTO_FIXES_SOURCE		:= $(SRCDIR)/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
 XORG_PROTO_FIXES_DIR		:= $(BUILDDIR)/$(XORG_PROTO_FIXES)
 
diff --git a/rules/xorg-proto-fontcache.make b/rules/xorg-proto-fontcache.make
index 1d086b0e9..3b2885362 100644
--- a/rules/xorg-proto-fontcache.make
+++ b/rules/xorg-proto-fontcache.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FONTCACHE) += xorg-proto-fontcache
 # Paths and names
 #
 XORG_PROTO_FONTCACHE_VERSION	:= 0.1.2
-XORG_PROTO_FONTCACHE		:= fontcacheproto-X11R7.0-$(XORG_PROTO_FONTCACHE_VERSION)
+XORG_PROTO_FONTCACHE		:= fontcacheproto-$(XORG_PROTO_FONTCACHE_VERSION)
 XORG_PROTO_FONTCACHE_SUFFIX	:= tar.bz2
-XORG_PROTO_FONTCACHE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX)
+XORG_PROTO_FONTCACHE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX)
 XORG_PROTO_FONTCACHE_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX)
 XORG_PROTO_FONTCACHE_DIR	:= $(BUILDDIR)/$(XORG_PROTO_FONTCACHE)
 
diff --git a/rules/xorg-proto-fonts.make b/rules/xorg-proto-fonts.make
index 2fc6b7c39..a7727618c 100644
--- a/rules/xorg-proto-fonts.make
+++ b/rules/xorg-proto-fonts.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FONTS) += xorg-proto-fonts
 # Paths and names
 #
 XORG_PROTO_FONTS_VERSION	:= 2.0.2
-XORG_PROTO_FONTS		:= fontsproto-X11R7.0-$(XORG_PROTO_FONTS_VERSION)
+XORG_PROTO_FONTS		:= fontsproto-$(XORG_PROTO_FONTS_VERSION)
 XORG_PROTO_FONTS_SUFFIX		:= tar.bz2
-XORG_PROTO_FONTS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
+XORG_PROTO_FONTS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
 XORG_PROTO_FONTS_SOURCE		:= $(SRCDIR)/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
 XORG_PROTO_FONTS_DIR		:= $(BUILDDIR)/$(XORG_PROTO_FONTS)
 
diff --git a/rules/xorg-proto-gl.make b/rules/xorg-proto-gl.make
index 502c9e422..72f3f11eb 100644
--- a/rules/xorg-proto-gl.make
+++ b/rules/xorg-proto-gl.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_GL) += xorg-proto-gl
 #
 # Paths and names
 #
-XORG_PROTO_GL_VERSION 	:= 1.4.7
-XORG_PROTO_GL		:= glproto-X11R7.1-$(XORG_PROTO_GL_VERSION)
+XORG_PROTO_GL_VERSION 	:= 1.4.8
+XORG_PROTO_GL		:= glproto-$(XORG_PROTO_GL_VERSION)
 XORG_PROTO_GL_SUFFIX	:= tar.bz2
-XORG_PROTO_GL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
+XORG_PROTO_GL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
 XORG_PROTO_GL_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
 XORG_PROTO_GL_DIR	:= $(BUILDDIR)/$(XORG_PROTO_GL)
 
diff --git a/rules/xorg-proto-input.make b/rules/xorg-proto-input.make
index 61280ee7a..8dddbd052 100644
--- a/rules/xorg-proto-input.make
+++ b/rules/xorg-proto-input.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_INPUT) += xorg-proto-input
 #
 # Paths and names
 #
-XORG_PROTO_INPUT_VERSION:= 1.3.2
-XORG_PROTO_INPUT	:= inputproto-X11R7.0-$(XORG_PROTO_INPUT_VERSION)
+XORG_PROTO_INPUT_VERSION:= 1.4.2.1
+XORG_PROTO_INPUT	:= inputproto-$(XORG_PROTO_INPUT_VERSION)
 XORG_PROTO_INPUT_SUFFIX	:= tar.bz2
-XORG_PROTO_INPUT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
+XORG_PROTO_INPUT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
 XORG_PROTO_INPUT_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
 XORG_PROTO_INPUT_DIR	:= $(BUILDDIR)/$(XORG_PROTO_INPUT)
 
diff --git a/rules/xorg-proto-kb.make b/rules/xorg-proto-kb.make
index 20e963b7f..ab8142c71 100644
--- a/rules/xorg-proto-kb.make
+++ b/rules/xorg-proto-kb.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_KB) += xorg-proto-kb
 #
 # Paths and names
 #
-XORG_PROTO_KB_VERSION 	:= 1.0.2
-XORG_PROTO_KB		:= kbproto-X11R7.0-$(XORG_PROTO_KB_VERSION)
+XORG_PROTO_KB_VERSION 	:= 1.0.3
+XORG_PROTO_KB		:= kbproto-$(XORG_PROTO_KB_VERSION)
 XORG_PROTO_KB_SUFFIX	:= tar.bz2
-XORG_PROTO_KB_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
+XORG_PROTO_KB_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
 XORG_PROTO_KB_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
 XORG_PROTO_KB_DIR	:= $(BUILDDIR)/$(XORG_PROTO_KB)
 
diff --git a/rules/xorg-proto-print.make b/rules/xorg-proto-print.make
index d7533ca84..2b875e116 100644
--- a/rules/xorg-proto-print.make
+++ b/rules/xorg-proto-print.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_PRINT) += xorg-proto-print
 # Paths and names
 #
 XORG_PROTO_PRINT_VERSION:= 1.0.3
-XORG_PROTO_PRINT	:= printproto-X11R7.0-$(XORG_PROTO_PRINT_VERSION)
+XORG_PROTO_PRINT	:= printproto-$(XORG_PROTO_PRINT_VERSION)
 XORG_PROTO_PRINT_SUFFIX	:= tar.bz2
-XORG_PROTO_PRINT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
+XORG_PROTO_PRINT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
 XORG_PROTO_PRINT_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
 XORG_PROTO_PRINT_DIR	:= $(BUILDDIR)/$(XORG_PROTO_PRINT)
 
diff --git a/rules/xorg-proto-randr.make b/rules/xorg-proto-randr.make
index 619df2ca5..f24c66998 100644
--- a/rules/xorg-proto-randr.make
+++ b/rules/xorg-proto-randr.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RANDR) += xorg-proto-randr
 #
 # Paths and names
 #
-XORG_PROTO_RANDR_VERSION:= 1.1.2
-XORG_PROTO_RANDR	:= randrproto-X11R7.0-$(XORG_PROTO_RANDR_VERSION)
+XORG_PROTO_RANDR_VERSION:= 1.2.1
+XORG_PROTO_RANDR	:= randrproto-$(XORG_PROTO_RANDR_VERSION)
 XORG_PROTO_RANDR_SUFFIX	:= tar.bz2
-XORG_PROTO_RANDR_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
+XORG_PROTO_RANDR_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
 XORG_PROTO_RANDR_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
 XORG_PROTO_RANDR_DIR	:= $(BUILDDIR)/$(XORG_PROTO_RANDR)
 
diff --git a/rules/xorg-proto-record.make b/rules/xorg-proto-record.make
index 1249bb5ba..b7a0dcaa2 100644
--- a/rules/xorg-proto-record.make
+++ b/rules/xorg-proto-record.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RECORD) += xorg-proto-record
 # Paths and names
 #
 XORG_PROTO_RECORD_VERSION	:= 1.13.2
-XORG_PROTO_RECORD		:= recordproto-X11R7.0-$(XORG_PROTO_RECORD_VERSION)
+XORG_PROTO_RECORD		:= recordproto-$(XORG_PROTO_RECORD_VERSION)
 XORG_PROTO_RECORD_SUFFIX	:= tar.bz2
-XORG_PROTO_RECORD_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
+XORG_PROTO_RECORD_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
 XORG_PROTO_RECORD_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
 XORG_PROTO_RECORD_DIR		:= $(BUILDDIR)/$(XORG_PROTO_RECORD)
 
diff --git a/rules/xorg-proto-render.make b/rules/xorg-proto-render.make
index a9f70cada..0fb5221e9 100644
--- a/rules/xorg-proto-render.make
+++ b/rules/xorg-proto-render.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RENDER) += xorg-proto-render
 #
 # Paths and names
 #
-XORG_PROTO_RENDER_VERSION	:= 0.9.2
-XORG_PROTO_RENDER		:= renderproto-X11R7.0-$(XORG_PROTO_RENDER_VERSION)
+XORG_PROTO_RENDER_VERSION	:= 0.9.3
+XORG_PROTO_RENDER		:= renderproto-$(XORG_PROTO_RENDER_VERSION)
 XORG_PROTO_RENDER_SUFFIX	:= tar.bz2
-XORG_PROTO_RENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
+XORG_PROTO_RENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
 XORG_PROTO_RENDER_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
 XORG_PROTO_RENDER_DIR		:= $(BUILDDIR)/$(XORG_PROTO_RENDER)
 
diff --git a/rules/xorg-proto-resource.make b/rules/xorg-proto-resource.make
index 0a994a8db..28fb45bde 100644
--- a/rules/xorg-proto-resource.make
+++ b/rules/xorg-proto-resource.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RESOURCE) += xorg-proto-resource
 # Paths and names
 #
 XORG_PROTO_RESOURCE_VERSION	:= 1.0.2
-XORG_PROTO_RESOURCE		:= resourceproto-X11R7.0-$(XORG_PROTO_RESOURCE_VERSION)
+XORG_PROTO_RESOURCE		:= resourceproto-$(XORG_PROTO_RESOURCE_VERSION)
 XORG_PROTO_RESOURCE_SUFFIX	:= tar.bz2
-XORG_PROTO_RESOURCE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
+XORG_PROTO_RESOURCE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
 XORG_PROTO_RESOURCE_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
 XORG_PROTO_RESOURCE_DIR		:= $(BUILDDIR)/$(XORG_PROTO_RESOURCE)
 
diff --git a/rules/xorg-proto-scrnsaver.make b/rules/xorg-proto-scrnsaver.make
index f6b2ebdac..6dafa322c 100644
--- a/rules/xorg-proto-scrnsaver.make
+++ b/rules/xorg-proto-scrnsaver.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_SCRNSAVER) += xorg-proto-scrnsaver
 # Paths and names
 #
 XORG_PROTO_SCRNSAVER_VERSION 	:= 1.1.0
-XORG_PROTO_SCRNSAVER		:= scrnsaverproto-X11R7.1-$(XORG_PROTO_SCRNSAVER_VERSION)
+XORG_PROTO_SCRNSAVER		:= scrnsaverproto-$(XORG_PROTO_SCRNSAVER_VERSION)
 XORG_PROTO_SCRNSAVER_SUFFIX	:= tar.bz2
-XORG_PROTO_SCRNSAVER_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
+XORG_PROTO_SCRNSAVER_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
 XORG_PROTO_SCRNSAVER_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
 XORG_PROTO_SCRNSAVER_DIR	:= $(BUILDDIR)/$(XORG_PROTO_SCRNSAVER)
 
diff --git a/rules/xorg-proto-trap.make b/rules/xorg-proto-trap.make
index 6da46678e..95bf3d780 100644
--- a/rules/xorg-proto-trap.make
+++ b/rules/xorg-proto-trap.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_TRAP) += xorg-proto-trap
 # Paths and names
 #
 XORG_PROTO_TRAP_VERSION := 3.4.3
-XORG_PROTO_TRAP		:= trapproto-X11R7.0-$(XORG_PROTO_TRAP_VERSION)
+XORG_PROTO_TRAP		:= trapproto-$(XORG_PROTO_TRAP_VERSION)
 XORG_PROTO_TRAP_SUFFIX	:= tar.bz2
-XORG_PROTO_TRAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX)
+XORG_PROTO_TRAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX)
 XORG_PROTO_TRAP_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX)
 XORG_PROTO_TRAP_DIR	:= $(BUILDDIR)/$(XORG_PROTO_TRAP)
 
diff --git a/rules/xorg-proto-video.make b/rules/xorg-proto-video.make
index 9e1bc0915..f41d9ace9 100644
--- a/rules/xorg-proto-video.make
+++ b/rules/xorg-proto-video.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_VIDEO) += xorg-proto-video
 # Paths and names
 #
 XORG_PROTO_VIDEO_VERSION:= 2.2.2
-XORG_PROTO_VIDEO	:= videoproto-X11R7.0-$(XORG_PROTO_VIDEO_VERSION)
+XORG_PROTO_VIDEO	:= videoproto-$(XORG_PROTO_VIDEO_VERSION)
 XORG_PROTO_VIDEO_SUFFIX	:= tar.bz2
-XORG_PROTO_VIDEO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
+XORG_PROTO_VIDEO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
 XORG_PROTO_VIDEO_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
 XORG_PROTO_VIDEO_DIR	:= $(BUILDDIR)/$(XORG_PROTO_VIDEO)
 
diff --git a/rules/xorg-proto-windowswm.make b/rules/xorg-proto-windowswm.make
index 97a93bc91..1b9b83127 100644
--- a/rules/xorg-proto-windowswm.make
+++ b/rules/xorg-proto-windowswm.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_WINDOWSWM) += xorg-proto-windowswm
 # Paths and names
 #
 XORG_PROTO_WINDOWSWM_VERSION 	:= 1.0.3
-XORG_PROTO_WINDOWSWM		:= windowswmproto-X11R7.0-$(XORG_PROTO_WINDOWSWM_VERSION)
+XORG_PROTO_WINDOWSWM		:= windowswmproto-$(XORG_PROTO_WINDOWSWM_VERSION)
 XORG_PROTO_WINDOWSWM_SUFFIX	:= tar.bz2
-XORG_PROTO_WINDOWSWM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
+XORG_PROTO_WINDOWSWM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
 XORG_PROTO_WINDOWSWM_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
 XORG_PROTO_WINDOWSWM_DIR	:= $(BUILDDIR)/$(XORG_PROTO_WINDOWSWM)
 
diff --git a/rules/xorg-proto-x.make b/rules/xorg-proto-x.make
index e7d67dba7..20324866e 100644
--- a/rules/xorg-proto-x.make
+++ b/rules/xorg-proto-x.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_X) += xorg-proto-x
 #
 # Paths and names
 #
-XORG_PROTO_X_VERSION 	:= 7.0.5
-XORG_PROTO_X		:= xproto-X11R7.1-$(XORG_PROTO_X_VERSION)
+XORG_PROTO_X_VERSION 	:= 7.0.10
+XORG_PROTO_X		:= xproto-$(XORG_PROTO_X_VERSION)
 XORG_PROTO_X_SUFFIX	:= tar.bz2
-XORG_PROTO_X_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
+XORG_PROTO_X_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
 XORG_PROTO_X_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
 XORG_PROTO_X_DIR	:= $(BUILDDIR)/$(XORG_PROTO_X)
 
diff --git a/rules/xorg-proto-xcmisc.make b/rules/xorg-proto-xcmisc.make
index 176dd1769..03710af83 100644
--- a/rules/xorg-proto-xcmisc.make
+++ b/rules/xorg-proto-xcmisc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XCMISC) += xorg-proto-xcmisc
 # Paths and names
 #
 XORG_PROTO_XCMISC_VERSION	:= 1.1.2
-XORG_PROTO_XCMISC		:= xcmiscproto-X11R7.0-$(XORG_PROTO_XCMISC_VERSION)
+XORG_PROTO_XCMISC		:= xcmiscproto-$(XORG_PROTO_XCMISC_VERSION)
 XORG_PROTO_XCMISC_SUFFIX	:= tar.bz2
-XORG_PROTO_XCMISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
+XORG_PROTO_XCMISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
 XORG_PROTO_XCMISC_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
 XORG_PROTO_XCMISC_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XCMISC)
 
diff --git a/rules/xorg-proto-xext.make b/rules/xorg-proto-xext.make
index b7276236f..de8628759 100644
--- a/rules/xorg-proto-xext.make
+++ b/rules/xorg-proto-xext.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XEXT) += xorg-proto-xext
 # Paths and names
 #
 XORG_PROTO_XEXT_VERSION := 7.0.2
-XORG_PROTO_XEXT		:= xextproto-X11R7.0-$(XORG_PROTO_XEXT_VERSION)
+XORG_PROTO_XEXT		:= xextproto-$(XORG_PROTO_XEXT_VERSION)
 XORG_PROTO_XEXT_SUFFIX	:= tar.bz2
-XORG_PROTO_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
+XORG_PROTO_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
 XORG_PROTO_XEXT_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
 XORG_PROTO_XEXT_DIR	:= $(BUILDDIR)/$(XORG_PROTO_XEXT)
 
diff --git a/rules/xorg-proto-xf86bigfont.make b/rules/xorg-proto-xf86bigfont.make
index 0343cae4a..c6af32f5b 100644
--- a/rules/xorg-proto-xf86bigfont.make
+++ b/rules/xorg-proto-xf86bigfont.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86BIGFONT) += xorg-proto-xf86bigfont
 # Paths and names
 #
 XORG_PROTO_XF86BIGFONT_VERSION	:= 1.1.2
-XORG_PROTO_XF86BIGFONT		:= xf86bigfontproto-X11R7.0-$(XORG_PROTO_XF86BIGFONT_VERSION)
+XORG_PROTO_XF86BIGFONT		:= xf86bigfontproto-$(XORG_PROTO_XF86BIGFONT_VERSION)
 XORG_PROTO_XF86BIGFONT_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86BIGFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
+XORG_PROTO_XF86BIGFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
 XORG_PROTO_XF86BIGFONT_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
 XORG_PROTO_XF86BIGFONT_DIR	:= $(BUILDDIR)/$(XORG_PROTO_XF86BIGFONT)
 
diff --git a/rules/xorg-proto-xf86dga.make b/rules/xorg-proto-xf86dga.make
index 8e3577373..7a6947e78 100644
--- a/rules/xorg-proto-xf86dga.make
+++ b/rules/xorg-proto-xf86dga.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86DGA) += xorg-proto-xf86dga
 #
 # Paths and names
 #
-XORG_PROTO_XF86DGA_VERSION	:= 2.0.2
-XORG_PROTO_XF86DGA		:= xf86dgaproto-X11R7.0-$(XORG_PROTO_XF86DGA_VERSION)
+XORG_PROTO_XF86DGA_VERSION	:= 2.0.3
+XORG_PROTO_XF86DGA		:= xf86dgaproto-$(XORG_PROTO_XF86DGA_VERSION)
 XORG_PROTO_XF86DGA_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86DGA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
+XORG_PROTO_XF86DGA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
 XORG_PROTO_XF86DGA_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
 XORG_PROTO_XF86DGA_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XF86DGA)
 
diff --git a/rules/xorg-proto-xf86dri.make b/rules/xorg-proto-xf86dri.make
index dbe1747ed..24438b086 100644
--- a/rules/xorg-proto-xf86dri.make
+++ b/rules/xorg-proto-xf86dri.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86DRI) += xorg-proto-xf86dri
 # Paths and names
 #
 XORG_PROTO_XF86DRI_VERSION	:= 2.0.3
-XORG_PROTO_XF86DRI		:= xf86driproto-X11R7.0-$(XORG_PROTO_XF86DRI_VERSION)
+XORG_PROTO_XF86DRI		:= xf86driproto-$(XORG_PROTO_XF86DRI_VERSION)
 XORG_PROTO_XF86DRI_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86DRI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
+XORG_PROTO_XF86DRI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
 XORG_PROTO_XF86DRI_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
 XORG_PROTO_XF86DRI_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XF86DRI)
 
diff --git a/rules/xorg-proto-xf86misc.make b/rules/xorg-proto-xf86misc.make
index 51f0412b8..33749564a 100644
--- a/rules/xorg-proto-xf86misc.make
+++ b/rules/xorg-proto-xf86misc.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86MISC) += xorg-proto-xf86misc
 # Paths and names
 #
 XORG_PROTO_XF86MISC_VERSION	:= 0.9.2
-XORG_PROTO_XF86MISC		:= xf86miscproto-X11R7.0-$(XORG_PROTO_XF86MISC_VERSION)
+XORG_PROTO_XF86MISC		:= xf86miscproto-$(XORG_PROTO_XF86MISC_VERSION)
 XORG_PROTO_XF86MISC_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
+XORG_PROTO_XF86MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
 XORG_PROTO_XF86MISC_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
 XORG_PROTO_XF86MISC_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XF86MISC)
 
diff --git a/rules/xorg-proto-xf86rush.make b/rules/xorg-proto-xf86rush.make
index d4b061f98..a83f21e81 100644
--- a/rules/xorg-proto-xf86rush.make
+++ b/rules/xorg-proto-xf86rush.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86RUSH) += xorg-proto-xf86rush
 # Paths and names
 #
 XORG_PROTO_XF86RUSH_VERSION	:= 1.1.2
-XORG_PROTO_XF86RUSH		:= xf86rushproto-X11R7.0-$(XORG_PROTO_XF86RUSH_VERSION)
+XORG_PROTO_XF86RUSH		:= xf86rushproto-$(XORG_PROTO_XF86RUSH_VERSION)
 XORG_PROTO_XF86RUSH_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86RUSH_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX)
+XORG_PROTO_XF86RUSH_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX)
 XORG_PROTO_XF86RUSH_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX)
 XORG_PROTO_XF86RUSH_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XF86RUSH)
 
diff --git a/rules/xorg-proto-xf86vidmode.make b/rules/xorg-proto-xf86vidmode.make
index abbf73aed..29a144cf5 100644
--- a/rules/xorg-proto-xf86vidmode.make
+++ b/rules/xorg-proto-xf86vidmode.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86VIDMODE) += xorg-proto-xf86vidmode
 # Paths and names
 #
 XORG_PROTO_XF86VIDMODE_VERSION	:= 2.2.2
-XORG_PROTO_XF86VIDMODE		:= xf86vidmodeproto-X11R7.0-$(XORG_PROTO_XF86VIDMODE_VERSION)
+XORG_PROTO_XF86VIDMODE		:= xf86vidmodeproto-$(XORG_PROTO_XF86VIDMODE_VERSION)
 XORG_PROTO_XF86VIDMODE_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86VIDMODE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
+XORG_PROTO_XF86VIDMODE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
 XORG_PROTO_XF86VIDMODE_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
 XORG_PROTO_XF86VIDMODE_DIR	:= $(BUILDDIR)/$(XORG_PROTO_XF86VIDMODE)
 
diff --git a/rules/xorg-proto-xinerama.make b/rules/xorg-proto-xinerama.make
index b4841b67b..22990c8f5 100644
--- a/rules/xorg-proto-xinerama.make
+++ b/rules/xorg-proto-xinerama.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XINERAMA) += xorg-proto-xinerama
 # Paths and names
 #
 XORG_PROTO_XINERAMA_VERSION 	:= 1.1.2
-XORG_PROTO_XINERAMA		:= xineramaproto-X11R7.0-$(XORG_PROTO_XINERAMA_VERSION)
+XORG_PROTO_XINERAMA		:= xineramaproto-$(XORG_PROTO_XINERAMA_VERSION)
 XORG_PROTO_XINERAMA_SUFFIX	:= tar.bz2
-XORG_PROTO_XINERAMA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
+XORG_PROTO_XINERAMA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
 XORG_PROTO_XINERAMA_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
 XORG_PROTO_XINERAMA_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XINERAMA)
 
diff --git a/rules/xorg-proto-xproxymanagement.make b/rules/xorg-proto-xproxymanagement.make
index 0cb87e3b6..fae4958b7 100644
--- a/rules/xorg-proto-xproxymanagement.make
+++ b/rules/xorg-proto-xproxymanagement.make
@@ -18,9 +18,9 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XPROXYMANAGEMENT) += xorg-proto-xproxymanagement
 # Paths and names
 #
 XORG_PROTO_XPROXYMANAGEMENT_VERSION	:= 1.0.2
-XORG_PROTO_XPROXYMANAGEMENT		:= xproxymanagementprotocol-X11R7.0-$(XORG_PROTO_XPROXYMANAGEMENT_VERSION)
+XORG_PROTO_XPROXYMANAGEMENT		:= xproxymanagementprotocol-$(XORG_PROTO_XPROXYMANAGEMENT_VERSION)
 XORG_PROTO_XPROXYMANAGEMENT_SUFFIX	:= tar.bz2
-XORG_PROTO_XPROXYMANAGEMENT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/src/proto/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX)
+XORG_PROTO_XPROXYMANAGEMENT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/proto/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX)
 XORG_PROTO_XPROXYMANAGEMENT_SOURCE	:= $(SRCDIR)/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX)
 XORG_PROTO_XPROXYMANAGEMENT_DIR		:= $(BUILDDIR)/$(XORG_PROTO_XPROXYMANAGEMENT)
 
diff --git a/rules/xorg-proto.in b/rules/xorg-proto.in
index 1f09a31ba..76c720159 100644
--- a/rules/xorg-proto.in
+++ b/rules/xorg-proto.in
@@ -1,5 +1,6 @@
 # xorg proto configuration
 
+source "rules/xcb-proto.in"
 source "rules/xorg-proto-applewm.in"
 source "rules/xorg-proto-bigreqs.in"
 source "rules/xorg-proto-composite.in"
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index ce3d46b59..fdb3c07da 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -35,6 +35,7 @@ menuconfig XORG_SERVER
 	select XORG_LIB_XKBFILE
 
 	select GLIBC_DL
+	select PIXMAN
 #
 # Required on demand
 #
diff --git a/rules/xorg-server.make b/rules/xorg-server.make
index 86ec7b17b..2104cac8b 100644
--- a/rules/xorg-server.make
+++ b/rules/xorg-server.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server
 #
 # Paths and names
 #
-XORG_SERVER_VERSION	:= 1.1.0
-XORG_SERVER		:= xorg-server-X11R7.1-$(XORG_SERVER_VERSION)
+XORG_SERVER_VERSION	:= 1.4
+XORG_SERVER		:= xorg-server-$(XORG_SERVER_VERSION)
 XORG_SERVER_SUFFIX	:= tar.bz2
-XORG_SERVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
+XORG_SERVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.3/src/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
 XORG_SERVER_SOURCE	:= $(SRCDIR)/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
 XORG_SERVER_DIR		:= $(BUILDDIR)/$(XORG_SERVER)
 
@@ -60,7 +60,7 @@ xorg-server_prepare: $(STATEDIR)/xorg-server.prepare
 XORG_SERVER_PATH	:=  PATH=$(CROSS_PATH)
 XORG_SERVER_ENV 	:=  $(CROSS_ENV) \
 	ac_cv_sys_linker_h=yes \
-	ac_cv_file__usr_share_X11_sgml_defs_ent=no
+	ac_cv_file__usr_share_sgml_X11_defs_ent=no
 
 # FIXME: not all processors upports MTRR. Geode GX1 not for example. But it
 # is a 586 clone. configure decides always to support mtrr!
@@ -73,8 +73,7 @@ XORG_SERVER_ENV 	:=  $(CROSS_ENV) \
 XORG_SERVER_AUTOCONF = $(CROSS_AUTOCONF_USR) \
 	$(XORG_OPTIONS_TRANS) \
 	--disable-dependency-tracking \
-	--localstatedir=/var \
-	--disable-builddocs
+	--localstatedir=/var
 #
 # if no value is given ignore the "--datadir" switch
 #
@@ -462,20 +461,20 @@ endif
 ifdef PTXCONF_XORG_DRIVER_VIDEO
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/fbdevhw/.libs/libfbdevhw.so, $(XORG_PREFIX)/lib/xorg/modules/linux/libfbdevhw.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libafb.so, $(XORG_PREFIX)/lib/xorg/modules/libafb.so)
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb16.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb16.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb16.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb16.so)
 #	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb24.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb24.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb32.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb32.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libcfb.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb.so)
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ddc/.libs/libddc.so, $(XORG_PREFIX)/lib/xorg/modules/libddc.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ddc/.libs/libddc.so, $(XORG_PREFIX)/lib/xorg/modules/libddc.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/exa/.libs/libexa.so, $(XORG_PREFIX)/lib/xorg/modules/libexa.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libfb.so, $(XORG_PREFIX)/lib/xorg/modules/libfb.so)
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/i2c/.libs/libi2c.so, $(XORG_PREFIX)/lib/xorg/modules/libi2c.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/i2c/.libs/libi2c.so, $(XORG_PREFIX)/lib/xorg/modules/libi2c.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/int10/.libs/libint10.so, $(XORG_PREFIX)/lib/xorg/modules/libint10.so)
 #	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/liblayer.so, $(XORG_PREFIX)/lib/xorg/modules/liblayer.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libmfb.so, $(XORG_PREFIX)/lib/xorg/modules/libmfb.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/scanpci/.libs/libpcidata.so, $(XORG_PREFIX)/lib/xorg/modules/libpcidata.so)
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/rac/.libs/librac.so, $(XORG_PREFIX)/lib/xorg/modules/librac.so)
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ramdac/.libs/libramdac.so, $(XORG_PREFIX)/lib/xorg/modules/libramdac.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/rac/.libs/librac.so, $(XORG_PREFIX)/lib/xorg/modules/librac.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/ramdac/.libs/libramdac.so, $(XORG_PREFIX)/lib/xorg/modules/libramdac.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/scanpci/.libs/libscanpci.so, $(XORG_PREFIX)/lib/xorg/modules/libscanpci.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/shadowfb/.libs/libshadowfb.so, $(XORG_PREFIX)/lib/xorg/modules/libshadowfb.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libshadow.so, $(XORG_PREFIX)/lib/xorg/modules/libshadow.so)
@@ -491,7 +490,7 @@ endif
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/extmod/.libs/libextmod.so ,/usr/lib/xorg/modules/extensions/libextmod.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libdbe.so ,/usr/lib/xorg/modules/extensions/libdbe.so)
 
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libbitmap.so ,/usr/lib/xorg/modules/fonts/libbitmap.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libbitmap.so ,/usr/lib/xorg/modules/fonts/libbitmap.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libfreetype.so ,/usr/lib/xorg/modules/fonts/libfreetype.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/dixmods/.libs/libtype1.so ,/usr/lib/xorg/modules/fonts/libtype1.so)
author	Michael Olbrich <m.olbrich@pengutronix.de>	2007-10-19 14:08:00 +0000
committer	Michael Olbrich <m.olbrich@pengutronix.de>	2007-10-19 14:08:00 +0000
commit	ac648c7bac43a5cefff95edfd20880c459f52edf (patch)
tree	8b7f9dfb0e612a6771162a3670c3be461f52d807 /rules
parent	3276365c54fb7e8e3fd2cc0eb4f128c90cb11962 (diff)
download	ptxdist-ac648c7bac43a5cefff95edfd20880c459f52edf.tar.gz ptxdist-ac648c7bac43a5cefff95edfd20880c459f52edf.tar.xz