merging to xorg7.1

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.10-trunk@5822 33e552b5-05e3-0310-8538-816dae2090ed
author: Luotao Fu <l.fu@pengutronix.de> 2006-06-19 15:30:00 +0000
committer: Luotao Fu <l.fu@pengutronix.de> 2006-06-19 15:30:00 +0000
commit: 5450510229001c331e13e7cf783b89208c765874 (patch)
tree: 28b4c6b1c9f2f88fe6437c9ed8169766cab4dc11 /rules
parent: 75f43a7cb50cb0eff7ea0c27ef72896fbe2528c4 (diff)
download: ptxdist-5450510229001c331e13e7cf783b89208c765874.tar.gz
ptxdist-5450510229001c331e13e7cf783b89208c765874.tar.xz
142 files changed, 917 insertions, 270 deletions
diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make
index 05a56a589..717e9bad6 100644
--- a/rules/xorg-app-mkfontdir.make
+++ b/rules/xorg-app-mkfontdir.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_APP_MKFONTDIR) += xorg-app-mkfontdir
 XORG_APP_MKFONTDIR_VERSION	:= 1.0.1
 XORG_APP_MKFONTDIR		:= mkfontscale-X11R7.0-$(XORG_APP_MKFONTDIR_VERSION)
 XORG_APP_MKFONTDIR_SUFFIX	:= tar.bz2
-XORG_APP_MKFONTDIR_URL		:= http://ftp.x.org/pub/X11R7.0/src/app/$(XORG_APP_MKFONTDIR).$(XORG_APP_MKFONTDIR_SUFFIX)
+XORG_APP_MKFONTDIR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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-rgb.make b/rules/xorg-app-rgb.make
index fdb0747e4..b8301b645 100644
--- a/rules/xorg-app-rgb.make
+++ b/rules/xorg-app-rgb.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_APP_RGB) += xorg-app-rgb
 #
 # Paths and names
 #
-XORG_APP_RGB_VERSION	:= 1.0.0
-XORG_APP_RGB		:= rgb-X11R7.0-$(XORG_APP_RGB_VERSION)
+XORG_APP_RGB_VERSION	:= 1.0.1
+XORG_APP_RGB		:= rgb-X11R7.1-$(XORG_APP_RGB_VERSION)
 XORG_APP_RGB_SUFFIX	:= tar.bz2
-XORG_APP_RGB_URL	:= http://ftp.x.org/pub/X11R7.0/src/app/$(XORG_APP_RGB).$(XORG_APP_RGB_SUFFIX)
+XORG_APP_RGB_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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-xdm.make b/rules/xorg-app-xdm.make
index efdabaa2d..88d5a89f4 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.1
-XORG_APP_XDM		:= xdm-X11R7.0-$(XORG_APP_XDM_VERSION)
+XORG_APP_XDM_VERSION	:= 1.0.4
+XORG_APP_XDM		:= xdm-X11R7.1-$(XORG_APP_XDM_VERSION)
 XORG_APP_XDM_SUFFIX	:= tar.bz2
-XORG_APP_XDM_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/app//$(XORG_APP_XDM).$(XORG_APP_XDM_SUFFIX)
+XORG_APP_XDM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 c06f220f7..d81efe411 100644
--- a/rules/xorg-app-xeyes.make
+++ b/rules/xorg-app-xeyes.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_APP_XEYES) += xorg-app-xeyes
 XORG_APP_XEYES_VERSION	:= 1.0.1
 XORG_APP_XEYES		:= xeyes-X11R7.0-$(XORG_APP_XEYES_VERSION)
 XORG_APP_XEYES_SUFFIX	:= tar.bz2
-XORG_APP_XEYES_URL	:= http://ftp.x.org/pub/X11R7.0/src/app//$(XORG_APP_XEYES).$(XORG_APP_XEYES_SUFFIX)
+XORG_APP_XEYES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 0f2b92c35..f7788caf7 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.0
-XORG_APP_XHOST		:= xhost-X11R7.0-$(XORG_APP_XHOST_VERSION)
+XORG_APP_XHOST_VERSION	:= 1.0.1
+XORG_APP_XHOST		:= xhost-X11R7.1-$(XORG_APP_XHOST_VERSION)
 XORG_APP_XHOST_SUFFIX	:= tar.bz2
-XORG_APP_XHOST_URL	:= http://ftp.x.org/pub/X11R7.0/src/app/$(XORG_APP_XHOST).$(XORG_APP_XHOST_SUFFIX)
+XORG_APP_XHOST_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 2ff9c3d5c..225508a31 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.1
-XORG_APP_XINIT		:= xinit-X11R7.0-$(XORG_APP_XINIT_VERSION)
+XORG_APP_XINIT_VERSION	:= 1.0.2
+XORG_APP_XINIT		:= xinit-X11R7.1-$(XORG_APP_XINIT_VERSION)
 XORG_APP_XINIT_SUFFIX	:= tar.bz2
-XORG_APP_XINIT_URL	:= http://ftp.x.org/pub/X11R7.0/src/app/$(XORG_APP_XINIT).$(XORG_APP_XINIT_SUFFIX)
+XORG_APP_XINIT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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-xsetroot.make b/rules/xorg-app-xsetroot.make
index 69ad67e43..e1bec81d6 100644
--- a/rules/xorg-app-xsetroot.make
+++ b/rules/xorg-app-xsetroot.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_APP_XSETROOT) += xorg-app-xsetroot
 XORG_APP_XSETROOT_VERSION	:= 1.0.1
 XORG_APP_XSETROOT		:= xsetroot-X11R7.0-$(XORG_APP_XSETROOT_VERSION)
 XORG_APP_XSETROOT_SUFFIX	:= tar.bz2
-XORG_APP_XSETROOT_URL		:= http://ftp.x.org/pub/X11R7.0/src/app//$(XORG_APP_XSETROOT).$(XORG_APP_XSETROOT_SUFFIX)
+XORG_APP_XSETROOT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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-data-xbitmaps.make b/rules/xorg-data-xbitmaps.make
index 231ca634e..b2fc0645c 100644
--- a/rules/xorg-data-xbitmaps.make
+++ b/rules/xorg-data-xbitmaps.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_DATA_XBITMAPS) += xorg-data-xbitmaps
 XORG_DATA_XBITMAPS_VERSION	:= 1.0.1
 XORG_DATA_XBITMAPS		:= xbitmaps-X11R7.0-$(XORG_DATA_XBITMAPS_VERSION)
 XORG_DATA_XBITMAPS_SUFFIX	:= tar.bz2
-XORG_DATA_XBITMAPS_URL		:= http://ftp.x.org/pub/X11R7.0/src/data/$(XORG_DATA_XBITMAPS).$(XORG_DATA_XBITMAPS_SUFFIX)
+XORG_DATA_XBITMAPS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 265c70f84..c856f1337 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.0.0.5
-XORG_DRIVER_INPUT_EVDEV		:= xf86-input-evdev-X11R7.0-$(XORG_DRIVER_INPUT_EVDEV_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_EVDEV_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_INPUT_EVDEV).$(XORG_DRIVER_INPUT_EVDEV_SUFFIX)
+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_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.in b/rules/xorg-driver-input-keyboard.in
index 96ee31e91..efc9d874d 100644
--- a/rules/xorg-driver-input-keyboard.in
+++ b/rules/xorg-driver-input-keyboard.in
@@ -2,6 +2,10 @@ config XORG_DRIVER_INPUT_KEYBOARD
 	bool
 	prompt "Keyboard"
 	depends on XORG_DRIVER_INPUT
+	select XORG_PROTO_X
+	select XORG_PROTO_RANDR
+	select XORG_PROTO_INPUT
+	select XORG_PROTO_KB
 	select XORG_SERVER
 	help
 	  FIXME
diff --git a/rules/xorg-driver-input-keyboard.make b/rules/xorg-driver-input-keyboard.make
index f2789794f..f62f6790d 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.0.1.3
-XORG_DRIVER_INPUT_KEYBOARD		:= xf86-input-keyboard-X11R7.0-$(XORG_DRIVER_INPUT_KEYBOARD_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_KEYBOARD_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
+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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_INPUT_KEYBOARD).$(XORG_DRIVER_INPUT_KEYBOARD_SUFFIX)
 XORG_DRIVER_INPUT_KEYBOARD_DIR		:= $(BUILDDIR)/$(XORG_DRIVER_INPUT_KEYBOARD)
 
diff --git a/rules/xorg-driver-input-mouse.make b/rules/xorg-driver-input-mouse.make
index 013dbe983..e2cd2c21f 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.0.3.1
-XORG_DRIVER_INPUT_MOUSE		:= xf86-input-mouse-X11R7.0-$(XORG_DRIVER_INPUT_MOUSE_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_MOUSE_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
+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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_INPUT_MOUSE).$(XORG_DRIVER_INPUT_MOUSE_SUFFIX)
 XORG_DRIVER_INPUT_MOUSE_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_INPUT_MOUSE)
 
diff --git a/rules/xorg-driver-input-tslib.make b/rules/xorg-driver-input-tslib.make
index 4c98fee17..ba5d1d8bb 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.1
+XORG_DRIVER_INPUT_TSLIB_VERSION	:= 0.0.2
 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 e85096250..dca11fd0c 100644
--- a/rules/xorg-driver-input-void.make
+++ b/rules/xorg-driver-input-void.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_INPUT_VOID) += xorg-driver-input-void
 #
 # Paths and names
 #
-XORG_DRIVER_INPUT_VOID_VERSION	:= 1.0.0.5
-XORG_DRIVER_INPUT_VOID		:= xf86-input-void-X11R7.0-$(XORG_DRIVER_INPUT_VOID_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_INPUT_VOID_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_INPUT_VOID).$(XORG_DRIVER_INPUT_VOID_SUFFIX)
+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_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.in b/rules/xorg-driver-video-apm.in
index 01dff41aa..f243349a6 100644
--- a/rules/xorg-driver-video-apm.in
+++ b/rules/xorg-driver-video-apm.in
@@ -1,14 +1,9 @@
 config XORG_DRIVER_VIDEO_APM
 	bool
 	depends on XORG_DRIVER_VIDEO
-	depends on BROKEN
 	select XORG_SERVER
 	select XORG_PROTO_X
 	select XORG_PROTO_FONTS
 	prompt "APM"
 	help
 	  FIXME
-
-comment "driver-video-apm is broken, please send a patch"
-	depends on !BROKEN
-	depends on XORG_DRIVER_VIDEO
diff --git a/rules/xorg-driver-video-apm.make b/rules/xorg-driver-video-apm.make
index 3f994daad..43754b2cf 100644
--- a/rules/xorg-driver-video-apm.make
+++ b/rules/xorg-driver-video-apm.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_APM) += xorg-driver-video-apm
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_APM_VERSION	:= 1.0.1.5
-XORG_DRIVER_VIDEO_APM		:= xf86-video-apm-X11R7.0-$(XORG_DRIVER_VIDEO_APM_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_APM_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
+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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_APM).$(XORG_DRIVER_VIDEO_APM_SUFFIX)
 XORG_DRIVER_VIDEO_APM_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_APM)
 
@@ -114,7 +114,9 @@ $(STATEDIR)/xorg-driver-video-apm.targetinstall: $(xorg-driver-video-apm_targeti
 	@$(call install_fixup, xorg-driver-video-apm,DEPENDS,)
 	@$(call install_fixup, xorg-driver-video-apm,DESCRIPTION,missing)
 
-#FIXME
+	@$(call install_copy, xorg-driver-video-apm, 0, 0, 0755, \
+		$(XORG_DRIVER_VIDEO_APM_DIR)/src/.libs/apm_drv.so, \
+		/usr/lib/xorg/modules/apm_drv.so)
 
 	@$(call install_finish, xorg-driver-video-apm)
 
diff --git a/rules/xorg-driver-video-ati.make b/rules/xorg-driver-video-ati.make
index 3edda7864..687383dde 100644
--- a/rules/xorg-driver-video-ati.make
+++ b/rules/xorg-driver-video-ati.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_ATI) += xorg-driver-video-ati
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_ATI_VERSION	:= 6.5.7.3
-XORG_DRIVER_VIDEO_ATI		:= xf86-video-ati-X11R7.0-$(XORG_DRIVER_VIDEO_ATI_VERSION)
+XORG_DRIVER_VIDEO_ATI_VERSION	:= 6.6.0
+XORG_DRIVER_VIDEO_ATI		:= xf86-video-ati-X11R7.1-$(XORG_DRIVER_VIDEO_ATI_VERSION)
 XORG_DRIVER_VIDEO_ATI_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_ATI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX)
+XORG_DRIVER_VIDEO_ATI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX)
 XORG_DRIVER_VIDEO_ATI_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_ATI).$(XORG_DRIVER_VIDEO_ATI_SUFFIX)
 XORG_DRIVER_VIDEO_ATI_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_ATI)
 
diff --git a/rules/xorg-driver-video-dummy.make b/rules/xorg-driver-video-dummy.make
index e6299cfa1..b542d9d0b 100644
--- a/rules/xorg-driver-video-dummy.make
+++ b/rules/xorg-driver-video-dummy.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_DRIVER_VIDEO_DUMMY) += xorg-driver-video-dummy
 #
 # Paths and names
 #
-XORG_DRIVER_VIDEO_DUMMY_VERSION	:= 0.1.0.5
-XORG_DRIVER_VIDEO_DUMMY		:= xf86-video-dummy-X11R7.0-$(XORG_DRIVER_VIDEO_DUMMY_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_DUMMY_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
+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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_DUMMY).$(XORG_DRIVER_VIDEO_DUMMY_SUFFIX)
 XORG_DRIVER_VIDEO_DUMMY_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_DUMMY)
 
@@ -114,7 +114,7 @@ $(STATEDIR)/xorg-driver-video-dummy.targetinstall: $(xorg-driver-video-dummy_tar
 	@$(call install_fixup, xorg-driver-video-dummy,DEPENDS,)
 	@$(call install_fixup, xorg-driver-video-dummy,DESCRIPTION,missing)
 
-#FIXME
+	@$(call install_copy, xorg-driver-video-dummy, 0, 0, 0755, $(XORG_DRIVER_VIDEO_DUMMY_DIR)/src/.libs/dummy_drv.so, /usr/lib/xorg/modules/dummy_drv.so)
 
 	@$(call install_finish, xorg-driver-video-dummy)
 
diff --git a/rules/xorg-driver-video-fbdev.make b/rules/xorg-driver-video-fbdev.make
index cb8cc0447..d4b8f8880 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.1.0.5
-XORG_DRIVER_VIDEO_FBDEV		:= xf86-video-fbdev-X11R7.0-$(XORG_DRIVER_VIDEO_FBDEV_VERSION)
+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_SUFFIX	:= tar.bz2
-XORG_DRIVER_VIDEO_FBDEV_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/driver//$(XORG_DRIVER_VIDEO_FBDEV).$(XORG_DRIVER_VIDEO_FBDEV_SUFFIX)
+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_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-i810.in b/rules/xorg-driver-video-i810.in
new file mode 100644
index 000000000..879f5107c
--- /dev/null
+++ b/rules/xorg-driver-video-i810.in
@@ -0,0 +1,34 @@
+# configuration for xorg-driver-video-i810
+
+menuconfig XORG_DRIVER_VIDEO_I810
+	bool
+	depends on XORG_DRIVER_VIDEO
+	select XORG_SERVER
+	select XORG_PROTO_X
+	select XORG_PROTO_FONTS
+	select XORG_LIB_XVMC
+	select XORG_PROTO_FONTS
+	select XORG_PROTO_RANDR
+	select XORG_PROTO_RENDER
+	select XORG_PROTO_XEXT
+	select XORG_LIB_X11
+	prompt "Intel i810"
+	help
+	  FIXME
+
+comment "X.org Intel i810 Driver"
+        depends on XORG_DRIVER_VIDEO_I810
+
+config XORG_DRIVER_VIDEO_I810_DRI
+	bool
+	depends on XORG_DRIVER_VIDEO_I810
+	select LIBDRM
+	select MESALIB
+	select XORG_PROTO_GL
+	select XORG_SERVER_EXT_GLX
+	select XORG_SERVER_EXT_DRI
+	select XORG_PROTO_XF86DRI
+        prompt "Enable DRI"
+        help
+          --enable-dri
+
diff --git a/rules/xorg-driver-video-i810.make b/rules/xorg-driver-video-i810.make
new file mode 100644
index 000000000..7c5112a75
--- /dev/null
+++ b/rules/xorg-driver-video-i810.make
@@ -0,0 +1,149 @@
+# -*-makefile-*-
+# $Id: template 5616 2006-06-02 13:50:47Z rsc $
+#
+# Copyright (C) 2006 by Erwin Rol
+#          
+# 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_XORG_DRIVER_VIDEO_I810) += xorg-driver-video-i810
+
+#
+# Paths and names
+#
+XORG_DRIVER_VIDEO_I810_VERSION	:= 1.6.0
+XORG_DRIVER_VIDEO_I810		:= xf86-video-i810-X11R7.1-$(XORG_DRIVER_VIDEO_I810_VERSION)
+XORG_DRIVER_VIDEO_I810_SUFFIX	:= tar.bz2
+XORG_DRIVER_VIDEO_I810_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/driver/$(XORG_DRIVER_VIDEO_I810).$(XORG_DRIVER_VIDEO_I810_SUFFIX)
+XORG_DRIVER_VIDEO_I810_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_I810).$(XORG_DRIVER_VIDEO_I810_SUFFIX)
+XORG_DRIVER_VIDEO_I810_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_I810)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_get: $(STATEDIR)/xorg-driver-video-i810.get
+
+$(STATEDIR)/xorg-driver-video-i810.get: $(xorg-driver-video-i810_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(XORG_DRIVER_VIDEO_I810_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, XORG_DRIVER_VIDEO_I810)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_extract: $(STATEDIR)/xorg-driver-video-i810.extract
+
+$(STATEDIR)/xorg-driver-video-i810.extract: $(xorg-driver-video-i810_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_I810_DIR))
+	@$(call extract, XORG_DRIVER_VIDEO_I810)
+	@$(call patchin, XORG_DRIVER_VIDEO_I810)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_prepare: $(STATEDIR)/xorg-driver-video-i810.prepare
+
+XORG_DRIVER_VIDEO_I810_PATH	:=  PATH=$(CROSS_PATH)
+XORG_DRIVER_VIDEO_I810_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+XORG_DRIVER_VIDEO_I810_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+ifdef PTXCONF_XORG_DRIVER_VIDEO_I810_DRI
+XORG_DRIVER_VIDEO_I810_AUTOCONF += --enable-dri
+else
+XORG_DRIVER_VIDEO_I810_AUTOCONF += --disable-dri
+endif
+
+$(STATEDIR)/xorg-driver-video-i810.prepare: $(xorg-driver-video-i810_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_I810_DIR)/config.cache)
+	cd $(XORG_DRIVER_VIDEO_I810_DIR) && \
+		$(XORG_DRIVER_VIDEO_I810_PATH) $(XORG_DRIVER_VIDEO_I810_ENV) \
+		./configure $(XORG_DRIVER_VIDEO_I810_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_compile: $(STATEDIR)/xorg-driver-video-i810.compile
+
+$(STATEDIR)/xorg-driver-video-i810.compile: $(xorg-driver-video-i810_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(XORG_DRIVER_VIDEO_I810_DIR) && $(XORG_DRIVER_VIDEO_I810_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_install: $(STATEDIR)/xorg-driver-video-i810.install
+
+$(STATEDIR)/xorg-driver-video-i810.install: $(xorg-driver-video-i810_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, XORG_DRIVER_VIDEO_I810)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_targetinstall: $(STATEDIR)/xorg-driver-video-i810.targetinstall
+
+$(STATEDIR)/xorg-driver-video-i810.targetinstall: $(xorg-driver-video-i810_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, xorg-driver-video-i810)
+	@$(call install_fixup,xorg-driver-video-i810,PACKAGE,xorg-driver-video-i810)
+	@$(call install_fixup,xorg-driver-video-i810,PRIORITY,optional)
+	@$(call install_fixup,xorg-driver-video-i810,VERSION,$(XORG_DRIVER_VIDEO_I810_VERSION))
+	@$(call install_fixup,xorg-driver-video-i810,SECTION,base)
+	@$(call install_fixup,xorg-driver-video-i810,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,xorg-driver-video-i810,DEPENDS,)
+	@$(call install_fixup,xorg-driver-video-i810,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-video-i810, 0, 0, 0755, \
+		$(XORG_DRIVER_VIDEO_I810_DIR)/src/.libs/i810_drv.so, \
+		/usr/lib/xorg/modules/i810_drv.so)
+
+	@$(call install_copy, xorg-driver-video-i810, 0, 0, 0644, \
+		$(XORG_DRIVER_VIDEO_I810_DIR)/src/xvmc/.libs/libI810XvMC.so.1.0.0, \
+		/usr/lib/libI810XvMC.so.1.0.0)
+	@$(call install_link, xorg-driver-video-i810, \
+		libI810XvMC.so.1.0.0, /usr/lib/libI810XvMC.so.1)
+	@$(call install_link, xorg-driver-video-i810, \
+		libI810XvMC.so.1.0.0, /usr/lib/libI810XvMC.so)
+
+	@$(call install_finish,xorg-driver-video-i810)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-i810_clean:
+	rm -rf $(STATEDIR)/xorg-driver-video-i810.*
+	rm -rf $(IMAGEDIR)/xorg-driver-video-i810_*
+	rm -rf $(XORG_DRIVER_VIDEO_I810_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-driver-video-v4l.in b/rules/xorg-driver-video-v4l.in
new file mode 100644
index 000000000..e615e651c
--- /dev/null
+++ b/rules/xorg-driver-video-v4l.in
@@ -0,0 +1,12 @@
+# configuration for xorg-driver-video-v4l
+
+config XORG_DRIVER_VIDEO_V4L
+	bool
+	depends on XORG_DRIVER_VIDEO
+	select XORG_SERVER
+	select XORG_PROTO_X
+	select XORG_PROTO_FONTS
+	prompt "Video for Linux v4l"
+	help
+	  FIXME
+
diff --git a/rules/xorg-driver-video-v4l.make b/rules/xorg-driver-video-v4l.make
new file mode 100644
index 000000000..2894c4b7b
--- /dev/null
+++ b/rules/xorg-driver-video-v4l.make
@@ -0,0 +1,135 @@
+# -*-makefile-*-
+# $Id: template 5616 2006-06-02 13:50:47Z rsc $
+#
+# Copyright (C) 2006 by Erwin Rol
+#          
+# 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_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_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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_V4L).$(XORG_DRIVER_VIDEO_V4L_SUFFIX)
+XORG_DRIVER_VIDEO_V4L_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_V4L)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_get: $(STATEDIR)/xorg-driver-video-v4l.get
+
+$(STATEDIR)/xorg-driver-video-v4l.get: $(xorg-driver-video-v4l_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(XORG_DRIVER_VIDEO_V4L_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, XORG_DRIVER_VIDEO_V4L)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_extract: $(STATEDIR)/xorg-driver-video-v4l.extract
+
+$(STATEDIR)/xorg-driver-video-v4l.extract: $(xorg-driver-video-v4l_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_V4L_DIR))
+	@$(call extract, XORG_DRIVER_VIDEO_V4L)
+	@$(call patchin, XORG_DRIVER_VIDEO_V4L)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_prepare: $(STATEDIR)/xorg-driver-video-v4l.prepare
+
+XORG_DRIVER_VIDEO_V4L_PATH	:=  PATH=$(CROSS_PATH)
+XORG_DRIVER_VIDEO_V4L_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+XORG_DRIVER_VIDEO_V4L_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/xorg-driver-video-v4l.prepare: $(xorg-driver-video-v4l_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_V4L_DIR)/config.cache)
+	cd $(XORG_DRIVER_VIDEO_V4L_DIR) && \
+		$(XORG_DRIVER_VIDEO_V4L_PATH) $(XORG_DRIVER_VIDEO_V4L_ENV) \
+		./configure $(XORG_DRIVER_VIDEO_V4L_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_compile: $(STATEDIR)/xorg-driver-video-v4l.compile
+
+$(STATEDIR)/xorg-driver-video-v4l.compile: $(xorg-driver-video-v4l_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(XORG_DRIVER_VIDEO_V4L_DIR) && $(XORG_DRIVER_VIDEO_V4L_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_install: $(STATEDIR)/xorg-driver-video-v4l.install
+
+$(STATEDIR)/xorg-driver-video-v4l.install: $(xorg-driver-video-v4l_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, XORG_DRIVER_VIDEO_V4L)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_targetinstall: $(STATEDIR)/xorg-driver-video-v4l.targetinstall
+
+$(STATEDIR)/xorg-driver-video-v4l.targetinstall: $(xorg-driver-video-v4l_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, xorg-driver-video-v4l)
+	@$(call install_fixup,xorg-driver-video-v4l,PACKAGE,xorg-driver-video-v4l)
+	@$(call install_fixup,xorg-driver-video-v4l,PRIORITY,optional)
+	@$(call install_fixup,xorg-driver-video-v4l,VERSION,$(XORG_DRIVER_VIDEO_V4L_VERSION))
+	@$(call install_fixup,xorg-driver-video-v4l,SECTION,base)
+	@$(call install_fixup,xorg-driver-video-v4l,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,xorg-driver-video-v4l,DEPENDS,)
+	@$(call install_fixup,xorg-driver-video-v4l,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-video-v4l, 0, 0, 0755, \
+		$(XORG_DRIVER_VIDEO_V4L_DIR)/src/.libs/v4l_drv.so, \
+		/usr/lib/xorg/modules/v4l_drv.so)
+
+	@$(call install_finish,xorg-driver-video-v4l)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-v4l_clean:
+	rm -rf $(STATEDIR)/xorg-driver-video-v4l.*
+	rm -rf $(IMAGEDIR)/xorg-driver-video-v4l_*
+	rm -rf $(XORG_DRIVER_VIDEO_V4L_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-driver-video-vesa.in b/rules/xorg-driver-video-vesa.in
new file mode 100644
index 000000000..7f2b499f4
--- /dev/null
+++ b/rules/xorg-driver-video-vesa.in
@@ -0,0 +1,13 @@
+# configuration for xorg-driver-video-vesa
+
+config XORG_DRIVER_VIDEO_VESA
+	bool
+	depends on XORG_DRIVER_VIDEO
+	select XORG_SERVER
+	select XORG_PROTO_X
+	select XORG_PROTO_FONTS
+	prompt "VESA"
+	help
+	  FIXME
+
+
diff --git a/rules/xorg-driver-video-vesa.make b/rules/xorg-driver-video-vesa.make
new file mode 100644
index 000000000..a1a318e8f
--- /dev/null
+++ b/rules/xorg-driver-video-vesa.make
@@ -0,0 +1,135 @@
+# -*-makefile-*-
+# $Id: template 5616 2006-06-02 13:50:47Z rsc $
+#
+# Copyright (C) 2006 by Erwin Rol
+#          
+# 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_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_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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_VESA).$(XORG_DRIVER_VIDEO_VESA_SUFFIX)
+XORG_DRIVER_VIDEO_VESA_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VESA)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_get: $(STATEDIR)/xorg-driver-video-vesa.get
+
+$(STATEDIR)/xorg-driver-video-vesa.get: $(xorg-driver-video-vesa_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(XORG_DRIVER_VIDEO_VESA_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, XORG_DRIVER_VIDEO_VESA)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_extract: $(STATEDIR)/xorg-driver-video-vesa.extract
+
+$(STATEDIR)/xorg-driver-video-vesa.extract: $(xorg-driver-video-vesa_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_VESA_DIR))
+	@$(call extract, XORG_DRIVER_VIDEO_VESA)
+	@$(call patchin, XORG_DRIVER_VIDEO_VESA)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_prepare: $(STATEDIR)/xorg-driver-video-vesa.prepare
+
+XORG_DRIVER_VIDEO_VESA_PATH	:=  PATH=$(CROSS_PATH)
+XORG_DRIVER_VIDEO_VESA_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+XORG_DRIVER_VIDEO_VESA_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/xorg-driver-video-vesa.prepare: $(xorg-driver-video-vesa_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_VESA_DIR)/config.cache)
+	cd $(XORG_DRIVER_VIDEO_VESA_DIR) && \
+		$(XORG_DRIVER_VIDEO_VESA_PATH) $(XORG_DRIVER_VIDEO_VESA_ENV) \
+		./configure $(XORG_DRIVER_VIDEO_VESA_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_compile: $(STATEDIR)/xorg-driver-video-vesa.compile
+
+$(STATEDIR)/xorg-driver-video-vesa.compile: $(xorg-driver-video-vesa_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(XORG_DRIVER_VIDEO_VESA_DIR) && $(XORG_DRIVER_VIDEO_VESA_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_install: $(STATEDIR)/xorg-driver-video-vesa.install
+
+$(STATEDIR)/xorg-driver-video-vesa.install: $(xorg-driver-video-vesa_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, XORG_DRIVER_VIDEO_VESA)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_targetinstall: $(STATEDIR)/xorg-driver-video-vesa.targetinstall
+
+$(STATEDIR)/xorg-driver-video-vesa.targetinstall: $(xorg-driver-video-vesa_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, xorg-driver-video-vesa)
+	@$(call install_fixup,xorg-driver-video-vesa,PACKAGE,xorg-driver-video-vesa)
+	@$(call install_fixup,xorg-driver-video-vesa,PRIORITY,optional)
+	@$(call install_fixup,xorg-driver-video-vesa,VERSION,$(XORG_DRIVER_VIDEO_VESA_VERSION))
+	@$(call install_fixup,xorg-driver-video-vesa,SECTION,base)
+	@$(call install_fixup,xorg-driver-video-vesa,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,xorg-driver-video-vesa,DEPENDS,)
+	@$(call install_fixup,xorg-driver-video-vesa,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-video-vesa, 0, 0, 0755, \
+		$(XORG_DRIVER_VIDEO_VESA_DIR)/src/.libs/vesa_drv.so, \
+		/usr/lib/xorg/modules/vesa_drv.so)
+
+	@$(call install_finish,xorg-driver-video-vesa)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vesa_clean:
+	rm -rf $(STATEDIR)/xorg-driver-video-vesa.*
+	rm -rf $(IMAGEDIR)/xorg-driver-video-vesa_*
+	rm -rf $(XORG_DRIVER_VIDEO_VESA_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-driver-video-vga.in b/rules/xorg-driver-video-vga.in
new file mode 100644
index 000000000..d05ff3eec
--- /dev/null
+++ b/rules/xorg-driver-video-vga.in
@@ -0,0 +1,13 @@
+# configuration for xorg-driver-video-vga
+
+config XORG_DRIVER_VIDEO_VGA
+	bool
+	depends on XORG_DRIVER_VIDEO
+	select XORG_SERVER
+	select XORG_PROTO_X
+	select XORG_PROTO_FONTS
+	prompt "VGA"
+	help
+	  FIXME
+
+
diff --git a/rules/xorg-driver-video-vga.make b/rules/xorg-driver-video-vga.make
new file mode 100644
index 000000000..25c7a522e
--- /dev/null
+++ b/rules/xorg-driver-video-vga.make
@@ -0,0 +1,135 @@
+# -*-makefile-*-
+# $Id: template 5616 2006-06-02 13:50:47Z rsc $
+#
+# Copyright (C) 2006 by Erwin rol
+#          
+# 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_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_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_SOURCE	:= $(SRCDIR)/$(XORG_DRIVER_VIDEO_VGA).$(XORG_DRIVER_VIDEO_VGA_SUFFIX)
+XORG_DRIVER_VIDEO_VGA_DIR	:= $(BUILDDIR)/$(XORG_DRIVER_VIDEO_VGA)
+
+-include $(call package_depfile)
+
+# ----------------------------------------------------------------------------
+# Get
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_get: $(STATEDIR)/xorg-driver-video-vga.get
+
+$(STATEDIR)/xorg-driver-video-vga.get: $(xorg-driver-video-vga_get_deps_default)
+	@$(call targetinfo, $@)
+	@$(call touch, $@)
+
+$(XORG_DRIVER_VIDEO_VGA_SOURCE):
+	@$(call targetinfo, $@)
+	@$(call get, XORG_DRIVER_VIDEO_VGA)
+
+# ----------------------------------------------------------------------------
+# Extract
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_extract: $(STATEDIR)/xorg-driver-video-vga.extract
+
+$(STATEDIR)/xorg-driver-video-vga.extract: $(xorg-driver-video-vga_extract_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_VGA_DIR))
+	@$(call extract, XORG_DRIVER_VIDEO_VGA)
+	@$(call patchin, XORG_DRIVER_VIDEO_VGA)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_prepare: $(STATEDIR)/xorg-driver-video-vga.prepare
+
+XORG_DRIVER_VIDEO_VGA_PATH	:=  PATH=$(CROSS_PATH)
+XORG_DRIVER_VIDEO_VGA_ENV 	:=  $(CROSS_ENV)
+
+#
+# autoconf
+#
+XORG_DRIVER_VIDEO_VGA_AUTOCONF := $(CROSS_AUTOCONF_USR)
+
+$(STATEDIR)/xorg-driver-video-vga.prepare: $(xorg-driver-video-vga_prepare_deps_default)
+	@$(call targetinfo, $@)
+	@$(call clean, $(XORG_DRIVER_VIDEO_VGA_DIR)/config.cache)
+	cd $(XORG_DRIVER_VIDEO_VGA_DIR) && \
+		$(XORG_DRIVER_VIDEO_VGA_PATH) $(XORG_DRIVER_VIDEO_VGA_ENV) \
+		./configure $(XORG_DRIVER_VIDEO_VGA_AUTOCONF)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Compile
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_compile: $(STATEDIR)/xorg-driver-video-vga.compile
+
+$(STATEDIR)/xorg-driver-video-vga.compile: $(xorg-driver-video-vga_compile_deps_default)
+	@$(call targetinfo, $@)
+	cd $(XORG_DRIVER_VIDEO_VGA_DIR) && $(XORG_DRIVER_VIDEO_VGA_PATH) make
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_install: $(STATEDIR)/xorg-driver-video-vga.install
+
+$(STATEDIR)/xorg-driver-video-vga.install: $(xorg-driver-video-vga_install_deps_default)
+	@$(call targetinfo, $@)
+	@$(call install, XORG_DRIVER_VIDEO_VGA)
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_targetinstall: $(STATEDIR)/xorg-driver-video-vga.targetinstall
+
+$(STATEDIR)/xorg-driver-video-vga.targetinstall: $(xorg-driver-video-vga_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, xorg-driver-video-vga)
+	@$(call install_fixup,xorg-driver-video-vga,PACKAGE,xorg-driver-video-vga)
+	@$(call install_fixup,xorg-driver-video-vga,PRIORITY,optional)
+	@$(call install_fixup,xorg-driver-video-vga,VERSION,$(XORG_DRIVER_VIDEO_VGA_VERSION))
+	@$(call install_fixup,xorg-driver-video-vga,SECTION,base)
+	@$(call install_fixup,xorg-driver-video-vga,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>")
+	@$(call install_fixup,xorg-driver-video-vga,DEPENDS,)
+	@$(call install_fixup,xorg-driver-video-vga,DESCRIPTION,missing)
+
+	@$(call install_copy, xorg-driver-video-vga, 0, 0, 0755, \
+		$(XORG_DRIVER_VIDEO_VGA_DIR)/src/.libs/vga_drv.so, \
+		/usr/lib/xorg/modules/vga_drv.so)
+
+	@$(call install_finish,xorg-driver-video-vga)
+
+	@$(call touch, $@)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+xorg-driver-video-vga_clean:
+	rm -rf $(STATEDIR)/xorg-driver-video-vga.*
+	rm -rf $(IMAGEDIR)/xorg-driver-video-vga_*
+	rm -rf $(XORG_DRIVER_VIDEO_VGA_DIR)
+
+# vim: syntax=make
diff --git a/rules/xorg-driver.in b/rules/xorg-driver.in
index 6c6221fe2..d48a5a138 100644
--- a/rules/xorg-driver.in
+++ b/rules/xorg-driver.in
@@ -16,4 +16,8 @@ source "rules/xorg-driver-video-apm.in"
 source "rules/xorg-driver-video-ati.in"
 source "rules/xorg-driver-video-dummy.in"
 source "rules/xorg-driver-video-fbdev.in"
+source "rules/xorg-driver-video-i810.in"
+source "rules/xorg-driver-video-v4l.in"
+source "rules/xorg-driver-video-vga.in"
+source "rules/xorg-driver-video-vesa.in"
 
diff --git a/rules/xorg-font-adobe-100dpi.make b/rules/xorg-font-adobe-100dpi.make
index d42cfada3..7ee67460c 100644
--- a/rules/xorg-font-adobe-100dpi.make
+++ b/rules/xorg-font-adobe-100dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_100DPI) += xorg-font-adobe-100dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_100DPI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_ADOBE_100DPI).$(XORG_FONT_ADOBE_100DPI_SUFFIX)
+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_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 d4f8aef1d..c1eb27dd8 100644
--- a/rules/xorg-font-adobe-75dpi.make
+++ b/rules/xorg-font-adobe-75dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_75DPI) += xorg-font-adobe-75dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_75DPI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_ADOBE_75DPI).$(XORG_FONT_ADOBE_75DPI_SUFFIX)
+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_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 6377231d5..568d81f6a 100644
--- a/rules/xorg-font-adobe-utopia-100dpi.make
+++ b/rules/xorg-font-adobe-utopia-100dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_100DPI) += xorg-font-adobe-utopia-100d
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_100DPI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/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.0/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 d58a69cbe..b8fd52c24 100644
--- a/rules/xorg-font-adobe-utopia-75dpi.make
+++ b/rules/xorg-font-adobe-utopia-75dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_75DPI) += xorg-font-adobe-utopia-75dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_75DPI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/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.0/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 38b650100..23323b3da 100644
--- a/rules/xorg-font-adobe-utopia-type1.make
+++ b/rules/xorg-font-adobe-utopia-type1.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ADOBE_UTOPIA_TYPE1) += xorg-font-adobe-utopia-type1
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ADOBE_UTOPIA_TYPE1_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/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.0/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 06e790f4c..c9d9b874f 100644
--- a/rules/xorg-font-alias.make
+++ b/rules/xorg-font-alias.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ALIAS) += xorg-font-alias
 XORG_FONT_ALIAS_VERSION	:= 1.0.1
 XORG_FONT_ALIAS		:= font-alias-X11R7.0-$(XORG_FONT_ALIAS_VERSION)
 XORG_FONT_ALIAS_SUFFIX	:= tar.bz2
-XORG_FONT_ALIAS_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_ALIAS).$(XORG_FONT_ALIAS_SUFFIX)
+XORG_FONT_ALIAS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 8fee9db33..7817ad221 100644
--- a/rules/xorg-font-arabic-misc.make
+++ b/rules/xorg-font-arabic-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ARABIC_MISC) += xorg-font-arabic-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ARABIC_MISC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_ARABIC_MISC).$(XORG_FONT_ARABIC_MISC_SUFFIX)
+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_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 e941cf061..25427df4c 100644
--- a/rules/xorg-font-bh-100dpi.make
+++ b/rules/xorg-font-bh-100dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_100DPI) += xorg-font-bh-100dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BH_100DPI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BH_100DPI).$(XORG_FONT_BH_100DPI_SUFFIX)
+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_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 c80349654..e8aed936f 100644
--- a/rules/xorg-font-bh-75dpi.make
+++ b/rules/xorg-font-bh-75dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_75DPI) += xorg-font-bh-75dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BH_75DPI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BH_75DPI).$(XORG_FONT_BH_75DPI_SUFFIX)
+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_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 e0d420d55..3b47733a4 100644
--- a/rules/xorg-font-bh-lucidatypewriter-100dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-100dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_100DPI) += xorg-font-bh-lucidat
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_100DPI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/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.0/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 173d00d9b..bb5410b3d 100644
--- a/rules/xorg-font-bh-lucidatypewriter-75dpi.make
+++ b/rules/xorg-font-bh-lucidatypewriter-75dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_LUCIDATYPEWRITER_75DPI) += xorg-font-bh-lucidaty
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BH_LUCIDATYPEWRITER_75DPI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/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.0/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 b67e02c73..970265dfb 100644
--- a/rules/xorg-font-bh-ttf.make
+++ b/rules/xorg-font-bh-ttf.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BH_TTF) += xorg-font-bh-ttf
 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_SUFFIX		:= tar.bz2
-XORG_FONT_BH_TTF_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BH_TTF).$(XORG_FONT_BH_TTF_SUFFIX)
+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_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 3817f37d1..98bfe170e 100644
--- a/rules/xorg-font-bitstream-100dpi.make
+++ b/rules/xorg-font-bitstream-100dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_100DPI) += xorg-font-bitstream-100dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_100DPI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_100DPI).$(XORG_FONT_BITSTREAM_100DPI_SUFFIX)
+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_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 bd7640023..4463af32f 100644
--- a/rules/xorg-font-bitstream-75dpi.make
+++ b/rules/xorg-font-bitstream-75dpi.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_75DPI) += xorg-font-bitstream-75dpi
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_75DPI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_75DPI).$(XORG_FONT_BITSTREAM_75DPI_SUFFIX)
+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_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 9198669c1..c500b20e0 100644
--- a/rules/xorg-font-bitstream-speedo.make
+++ b/rules/xorg-font-bitstream-speedo.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_SPEEDO) += xorg-font-bitstream-speedo
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_SPEEDO_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_SPEEDO).$(XORG_FONT_BITSTREAM_SPEEDO_SUFFIX)
+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_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 4906b6b3d..1f6d14137 100644
--- a/rules/xorg-font-bitstream-type1.make
+++ b/rules/xorg-font-bitstream-type1.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_BITSTREAM_TYPE1) += xorg-font-bitstream-type1
 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_SUFFIX	:= tar.bz2
-XORG_FONT_BITSTREAM_TYPE1_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_BITSTREAM_TYPE1).$(XORG_FONT_BITSTREAM_TYPE1_SUFFIX)
+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_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 deec9dcc7..a89df0ee7 100644
--- a/rules/xorg-font-cronyx-cyrillic.make
+++ b/rules/xorg-font-cronyx-cyrillic.make
@@ -20,8 +20,8 @@ PACKAGES-$(PTXCONF_XORG_FONT_CRONYX_CYRILLIC) += xorg-font-cronyx-cyrillic
 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_SUFFIX	:= tar.bz2
-XORG_FONT_CRONYX_CYRILLIC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/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_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 de786dc58..eebb28a0c 100644
--- a/rules/xorg-font-cursor-misc.make
+++ b/rules/xorg-font-cursor-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_CURSOR_MISC) += xorg-font-cursor-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_CURSOR_MISC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_CURSOR_MISC).$(XORG_FONT_CURSOR_MISC_SUFFIX)
+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_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 e4db202e5..86c79160d 100644
--- a/rules/xorg-font-daewoo-misc.make
+++ b/rules/xorg-font-daewoo-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_DAEWOO_MISC) += xorg-font-daewoo-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_DAEWOO_MISC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_DAEWOO_MISC).$(XORG_FONT_DAEWOO_MISC_SUFFIX)
+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_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 6e0b3bf7e..bafdc4fac 100644
--- a/rules/xorg-font-dec-misc.make
+++ b/rules/xorg-font-dec-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_DEC_MISC) += xorg-font-dec-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_DEC_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_DEC_MISC).$(XORG_FONT_DEC_MISC_SUFFIX)
+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_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 e772029d8..410056608 100644
--- a/rules/xorg-font-encodings.make
+++ b/rules/xorg-font-encodings.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ENCODINGS) += xorg-font-encodings
 XORG_FONT_ENCODINGS_VERSION	:= 1.0.0
 XORG_FONT_ENCODINGS		:= encodings-X11R7.0-$(XORG_FONT_ENCODINGS_VERSION)
 XORG_FONT_ENCODINGS_SUFFIX	:= tar.bz2
-XORG_FONT_ENCODINGS_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_ENCODINGS).$(XORG_FONT_ENCODINGS_SUFFIX)
+XORG_FONT_ENCODINGS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 9da6182f2..e6a61e7a5 100644
--- a/rules/xorg-font-ibm-type1.make
+++ b/rules/xorg-font-ibm-type1.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_IBM_TYPE1) += xorg-font-ibm-type1
 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_SUFFIX	:= tar.bz2
-XORG_FONT_IBM_TYPE1_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_IBM_TYPE1).$(XORG_FONT_IBM_TYPE1_SUFFIX)
+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_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 3ecfb0140..d4d1d4f7f 100644
--- a/rules/xorg-font-isas-misc.make
+++ b/rules/xorg-font-isas-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_ISAS_MISC) += xorg-font-isas-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_ISAS_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_ISAS_MISC).$(XORG_FONT_ISAS_MISC_SUFFIX)
+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_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 3e53141bf..33265ddbd 100644
--- a/rules/xorg-font-jis-misc.make
+++ b/rules/xorg-font-jis-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_JIS_MISC) += xorg-font-jis-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_JIS_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_JIS_MISC).$(XORG_FONT_JIS_MISC_SUFFIX)
+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_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 49a06b0d1..599aa47b8 100644
--- a/rules/xorg-font-micro-misc.make
+++ b/rules/xorg-font-micro-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_MICRO_MISC) += xorg-font-micro-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_MICRO_MISC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_MICRO_MISC).$(XORG_FONT_MICRO_MISC_SUFFIX)
+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_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 ded1151d2..a41b3130c 100644
--- a/rules/xorg-font-misc-cyrillic.make
+++ b/rules/xorg-font-misc-cyrillic.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_CYRILLIC) += xorg-font-misc-cyrillic
 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_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_CYRILLIC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_MISC_CYRILLIC).$(XORG_FONT_MISC_CYRILLIC_SUFFIX)
+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_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 c71e26b14..bd041efa5 100644
--- a/rules/xorg-font-misc-ethiopic.make
+++ b/rules/xorg-font-misc-ethiopic.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_ETHIOPIC) += xorg-font-misc-ethiopic
 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_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_ETHIOPIC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_MISC_ETHIOPIC).$(XORG_FONT_MISC_ETHIOPIC_SUFFIX)
+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_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 cb7e476f9..7aca56e9c 100644
--- a/rules/xorg-font-misc-meltho.make
+++ b/rules/xorg-font-misc-meltho.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MELTHO) += xorg-font-misc-meltho
 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_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_MELTHO_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_MISC_MELTHO).$(XORG_FONT_MISC_MELTHO_SUFFIX)
+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_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 78c6821d8..6e179b68f 100644
--- a/rules/xorg-font-misc-misc.make
+++ b/rules/xorg-font-misc-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_MISC_MISC) += xorg-font-misc-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_MISC_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_MISC_MISC).$(XORG_FONT_MISC_MISC_SUFFIX)
+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_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 e499c39da..57d628383 100644
--- a/rules/xorg-font-mutt-misc.make
+++ b/rules/xorg-font-mutt-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_MUTT_MISC) += xorg-font-mutt-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_MUTT_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_MUTT_MISC).$(XORG_FONT_MUTT_MISC_SUFFIX)
+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_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 9735048ca..e5ef6751d 100644
--- a/rules/xorg-font-schumacher-misc.make
+++ b/rules/xorg-font-schumacher-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCHUMACHER_MISC) += xorg-font-schumacher-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_SCHUMACHER_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_SCHUMACHER_MISC).$(XORG_FONT_SCHUMACHER_MISC_SUFFIX)
+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_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 4fed09e71..dd4b564a2 100644
--- a/rules/xorg-font-screen-cyrillic.make
+++ b/rules/xorg-font-screen-cyrillic.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_SCREEN_CYRILLIC) += xorg-font-screen-cyrillic
 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_SUFFIX	:= tar.bz2
-XORG_FONT_SCREEN_CYRILLIC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_SCREEN_CYRILLIC).$(XORG_FONT_SCREEN_CYRILLIC_SUFFIX)
+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_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 4bfdc500d..ef5b84d26 100644
--- a/rules/xorg-font-sony-misc.make
+++ b/rules/xorg-font-sony-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_SONY_MISC) += xorg-font-sony-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_SONY_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_SONY_MISC).$(XORG_FONT_SONY_MISC_SUFFIX)
+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_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 c58ed6081..6a8dc5622 100644
--- a/rules/xorg-font-sun-misc.make
+++ b/rules/xorg-font-sun-misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_SUN_MISC) += xorg-font-sun-misc
 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_SUFFIX	:= tar.bz2
-XORG_FONT_SUN_MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_SUN_MISC).$(XORG_FONT_SUN_MISC_SUFFIX)
+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_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 a800622a7..b77dc818c 100644
--- a/rules/xorg-font-util.make
+++ b/rules/xorg-font-util.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_FONT_UTIL) += xorg-font-util
 #
 # Paths and names
 #
-XORG_FONT_UTIL_VERSION	:= 1.0.0
-XORG_FONT_UTIL		:= font-util-X11R7.0-$(XORG_FONT_UTIL_VERSION)
+XORG_FONT_UTIL_VERSION	:= 1.0.1
+XORG_FONT_UTIL		:= font-util-X11R7.1-$(XORG_FONT_UTIL_VERSION)
 XORG_FONT_UTIL_SUFFIX	:= tar.bz2
-XORG_FONT_UTIL_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_UTIL).$(XORG_FONT_UTIL_SUFFIX)
+XORG_FONT_UTIL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 4c01ab488..8c24b9ad6 100644
--- a/rules/xorg-font-winitzki-cyrillic.make
+++ b/rules/xorg-font-winitzki-cyrillic.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_WINITZKI_CYRILLIC) += xorg-font-winitzki-cyrillic
 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_SUFFIX	:= tar.bz2
-XORG_FONT_WINITZKI_CYRILLIC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_WINITZKI_CYRILLIC).$(XORG_FONT_WINITZKI_CYRILLIC_SUFFIX)
+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_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 b9f5bd29f..13a9cb0ba 100644
--- a/rules/xorg-font-xfree86-type1.make
+++ b/rules/xorg-font-xfree86-type1.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_FONT_XFREE86_TYPE1) += xorg-font-xfree86-type1
 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_SUFFIX	:= tar.bz2
-XORG_FONT_XFREE86_TYPE1_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/font//$(XORG_FONT_XFREE86_TYPE1).$(XORG_FONT_XFREE86_TYPE1_SUFFIX)
+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_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 24488864d..5768692fa 100644
--- a/rules/xorg-lib-AppleWM.make
+++ b/rules/xorg-lib-AppleWM.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_APPLEWM) += xorg-lib-AppleWM
 XORG_LIB_APPLEWM_VERSION	:= 1.0.0
 XORG_LIB_APPLEWM		:= libAppleWM-X11R7.0-$(XORG_LIB_APPLEWM_VERSION)
 XORG_LIB_APPLEWM_SUFFIX		:= tar.bz2
-XORG_LIB_APPLEWM_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_APPLEWM).$(XORG_LIB_APPLEWM_SUFFIX)
+XORG_LIB_APPLEWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 d5c0dbd16..c241611ae 100644
--- a/rules/xorg-lib-FS.make
+++ b/rules/xorg-lib-FS.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_FS) += xorg-lib-FS
 XORG_LIB_FS_VERSION	:= 1.0.0
 XORG_LIB_FS		:= libFS-X11R7.0-$(XORG_LIB_FS_VERSION)
 XORG_LIB_FS_SUFFIX	:= tar.bz2
-XORG_LIB_FS_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_FS).$(XORG_LIB_FS_SUFFIX)
+XORG_LIB_FS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 7e7f27190..895fa6542 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.0
-XORG_LIB_ICE		:= libICE-X11R7.0-$(XORG_LIB_ICE_VERSION)
+XORG_LIB_ICE_VERSION	:= 1.0.1
+XORG_LIB_ICE		:= libICE-X11R7.1-$(XORG_LIB_ICE_VERSION)
 XORG_LIB_ICE_SUFFIX	:= tar.bz2
-XORG_LIB_ICE_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_ICE).$(XORG_LIB_ICE_SUFFIX)
+XORG_LIB_ICE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 1beaf372b..2f0e064b4 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.0
-XORG_LIB_SM		:= libSM-X11R7.0-$(XORG_LIB_SM_VERSION)
+XORG_LIB_SM_VERSION	:= 1.0.1
+XORG_LIB_SM		:= libSM-X11R7.1-$(XORG_LIB_SM_VERSION)
 XORG_LIB_SM_SUFFIX	:= tar.bz2
-XORG_LIB_SM_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_SM).$(XORG_LIB_SM_SUFFIX)
+XORG_LIB_SM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 302370bc7..df86cd378 100644
--- a/rules/xorg-lib-WindowsWM.make
+++ b/rules/xorg-lib-WindowsWM.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_WINDOWSWM) += xorg-lib-WindowsWM
 XORG_LIB_WINDOWSWM_VERSION	:= 1.0.0
 XORG_LIB_WINDOWSWM		:= libWindowsWM-X11R7.0-$(XORG_LIB_WINDOWSWM_VERSION)
 XORG_LIB_WINDOWSWM_SUFFIX	:= tar.bz2
-XORG_LIB_WINDOWSWM_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_WINDOWSWM).$(XORG_LIB_WINDOWSWM_SUFFIX)
+XORG_LIB_WINDOWSWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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.make b/rules/xorg-lib-X11.make
index 124b4000e..e800990e3 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.0
-XORG_LIB_X11		:= libX11-X11R7.0-$(XORG_LIB_X11_VERSION)
+XORG_LIB_X11_VERSION	:= 1.0.1
+XORG_LIB_X11		:= libX11-X11R7.1-$(XORG_LIB_X11_VERSION)
 XORG_LIB_X11_SUFFIX	:= tar.bz2
-XORG_LIB_X11_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_X11).$(XORG_LIB_X11_SUFFIX)
+XORG_LIB_X11_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 376751f85..0745e2ab6 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.0.1
-XORG_LIB_XSCRNSAVER		:= libXScrnSaver-X11R7.0-$(XORG_LIB_XSCRNSAVER_VERSION)
+XORG_LIB_XSCRNSAVER_VERSION	:= 1.1.0
+XORG_LIB_XSCRNSAVER		:= libXScrnSaver-X11R7.1-$(XORG_LIB_XSCRNSAVER_VERSION)
 XORG_LIB_XSCRNSAVER_SUFFIX	:= tar.bz2
-XORG_LIB_XSCRNSAVER_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XSCRNSAVER).$(XORG_LIB_XSCRNSAVER_SUFFIX)
+XORG_LIB_XSCRNSAVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 605ae48d7..f39ac780a 100644
--- a/rules/xorg-lib-XTrap.make
+++ b/rules/xorg-lib-XTrap.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRAP) += xorg-lib-XTrap
 XORG_LIB_XTRAP_VERSION	:= 1.0.0
 XORG_LIB_XTRAP		:= libXTrap-X11R7.0-$(XORG_LIB_XTRAP_VERSION)
 XORG_LIB_XTRAP_SUFFIX	:= tar.bz2
-XORG_LIB_XTRAP_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XTRAP).$(XORG_LIB_XTRAP_SUFFIX)
+XORG_LIB_XTRAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 9ced89201..bb6e719d2 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.0
-XORG_LIB_XAU		:= libXau-X11R7.0-$(XORG_LIB_XAU_VERSION)
+XORG_LIB_XAU_VERSION	:= 1.0.1
+XORG_LIB_XAU		:= libXau-X11R7.1-$(XORG_LIB_XAU_VERSION)
 XORG_LIB_XAU_SUFFIX	:= tar.bz2
-XORG_LIB_XAU_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XAU).$(XORG_LIB_XAU_SUFFIX)
+XORG_LIB_XAU_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 8bed05c04..87957b918 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.1
-XORG_LIB_XAW		:= libXaw-X11R7.0-$(XORG_LIB_XAW_VERSION)
+XORG_LIB_XAW_VERSION	:= 1.0.2
+XORG_LIB_XAW		:= libXaw-X11R7.1-$(XORG_LIB_XAW_VERSION)
 XORG_LIB_XAW_SUFFIX	:= tar.bz2
-XORG_LIB_XAW_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XAW).$(XORG_LIB_XAW_SUFFIX)
+XORG_LIB_XAW_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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)
 
@@ -114,37 +114,53 @@ $(STATEDIR)/xorg-lib-Xaw.targetinstall: $(xorg-lib-Xaw_targetinstall_deps_defaul
 	@$(call install_fixup, xorg-lib-Xaw,DEPENDS,)
 	@$(call install_fixup, xorg-lib-Xaw,DESCRIPTION,missing)
 
-	@$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \
-		$(XORG_LIB_XAW_DIR)/src/.libs/libXaw6.so.6.0.1, \
-		$(XORG_LIBDIR)/libXaw6.so.6.0.1)
+	#@$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \
+	#	$(XORG_LIB_XAW_DIR)/src/.libs/libXaw6.so.6.0.1, \
+	#	$(XORG_LIBDIR)/libXaw6.so.6.0.1)
 
-	@$(call install_link, xorg-lib-Xaw, \
-		libXaw6.so.6.0.1, \
-		$(XORG_LIBDIR)/libXaw6.so.6)
+	#@$(call install_link, xorg-lib-Xaw, \
+	#	libXaw6.so.6.0.1, \
+	#	$(XORG_LIBDIR)/libXaw6.so.6)
 
-	@$(call install_link, xorg-lib-Xaw, \
-		libXaw6.so.6.0.1, \
-		$(XORG_LIBDIR)/libXaw6.so)
+	#@$(call install_link, xorg-lib-Xaw, \
+	#	libXaw6.so.6.0.1, \
+	#	$(XORG_LIBDIR)/libXaw6.so)
 
-	@$(call install_link, xorg-lib-Xaw, \
-		libXaw6.so.6.0.1, \
-		$(XORG_LIBDIR)/libXaw.so.6)
+	#@$(call install_link, xorg-lib-Xaw, \
+	#	libXaw6.so.6.0.1, \
+	#	$(XORG_LIBDIR)/libXaw.so.6)
+
+	#@$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \
+	#	$(XORG_LIB_XAW_DIR)/src/.libs/libXaw7.so.7.0.0, \
+	#	$(XORG_LIBDIR)/libXaw7.so.7.0.0)
+
+	#@$(call install_link, xorg-lib-Xaw, \
+	#	libXaw7.so.7.0.0, \
+	#	$(XORG_LIBDIR)/libXaw7.so.7)
+
+	#@$(call install_link, xorg-lib-Xaw, \
+	#	libXaw7.so.7.0.0, \
+	#	$(XORG_LIBDIR)/libXaw7.so)
+
+	#@$(call install_link, xorg-lib-Xaw, \
+	#	libXaw7.so.7.0.0, \
+	#	$(XORG_LIBDIR)/libXaw.so.7)
 
 	@$(call install_copy, xorg-lib-Xaw, 0, 0, 0644, \
-		$(XORG_LIB_XAW_DIR)/src/.libs/libXaw7.so.7.0.0, \
-		$(XORG_LIBDIR)/libXaw7.so.7.0.0)
+		$(XORG_LIB_XAW_DIR)/src/.libs/libXaw8.so.8.0.0, \
+		$(XORG_LIBDIR)/libXaw8.so.8.0.0)
 
 	@$(call install_link, xorg-lib-Xaw, \
-		libXaw7.so.7.0.0, \
-		$(XORG_LIBDIR)/libXaw7.so.7)
+ 		libXaw8.so.8.0.0, \
+ 		$(XORG_LIBDIR)/libXaw8.so.8)
 
 	@$(call install_link, xorg-lib-Xaw, \
-		libXaw7.so.7.0.0, \
-		$(XORG_LIBDIR)/libXaw7.so)
+		libXaw8.so.8.0.0, \
+		$(XORG_LIBDIR)/libXaw8.so)
 
 	@$(call install_link, xorg-lib-Xaw, \
-		libXaw7.so.7.0.0, \
-		$(XORG_LIBDIR)/libXaw.so.7)
+		libXaw8.so.8.0.0, \
+		$(XORG_LIBDIR)/libXaw.so.8)
 
 	@$(call install_finish, xorg-lib-Xaw)
 
diff --git a/rules/xorg-lib-Xcomposite.make b/rules/xorg-lib-Xcomposite.make
index 5b9825af4..f7e184e44 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.2.2.2
-XORG_LIB_XCOMPOSITE		:= libXcomposite-X11R7.0-$(XORG_LIB_XCOMPOSITE_VERSION)
+XORG_LIB_XCOMPOSITE_VERSION	:= 0.3
+XORG_LIB_XCOMPOSITE		:= libXcomposite-X11R7.1-$(XORG_LIB_XCOMPOSITE_VERSION)
 XORG_LIB_XCOMPOSITE_SUFFIX	:= tar.bz2
-XORG_LIB_XCOMPOSITE_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XCOMPOSITE).$(XORG_LIB_XCOMPOSITE_SUFFIX)
+XORG_LIB_XCOMPOSITE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 2a9e2331c..eb23c0244 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.5.2
-XORG_LIB_XCURSOR		:= libXcursor-X11R7.0-$(XORG_LIB_XCURSOR_VERSION)
+XORG_LIB_XCURSOR_VERSION	:= 1.1.6
+XORG_LIB_XCURSOR		:= libXcursor-X11R7.1-$(XORG_LIB_XCURSOR_VERSION)
 XORG_LIB_XCURSOR_SUFFIX		:= tar.bz2
-XORG_LIB_XCURSOR_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XCURSOR).$(XORG_LIB_XCURSOR_SUFFIX)
+XORG_LIB_XCURSOR_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 8cf8a73f3..dd7deb1ca 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.2.2
-XORG_LIB_XDAMAGE		:= libXdamage-X11R7.0-$(XORG_LIB_XDAMAGE_VERSION)
+XORG_LIB_XDAMAGE_VERSION	:= 1.0.3
+XORG_LIB_XDAMAGE		:= libXdamage-X11R7.1-$(XORG_LIB_XDAMAGE_VERSION)
 XORG_LIB_XDAMAGE_SUFFIX		:= tar.bz2
-XORG_LIB_XDAMAGE_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XDAMAGE).$(XORG_LIB_XDAMAGE_SUFFIX)
+XORG_LIB_XDAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 d7b2d68c9..fb8684930 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.0
-XORG_LIB_XDMCP		:= libXdmcp-X11R7.0-$(XORG_LIB_XDMCP_VERSION)
+XORG_LIB_XDMCP_VERSION	:= 1.0.1
+XORG_LIB_XDMCP		:= libXdmcp-X11R7.1-$(XORG_LIB_XDMCP_VERSION)
 XORG_LIB_XDMCP_SUFFIX	:= tar.bz2
-XORG_LIB_XDMCP_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XDMCP).$(XORG_LIB_XDMCP_SUFFIX)
+XORG_LIB_XDMCP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 9fb58934f..e614bae97 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.0
-XORG_LIB_XEVIE		:= libXevie-X11R7.0-$(XORG_LIB_XEVIE_VERSION)
+XORG_LIB_XEVIE_VERSION	:= 1.0.1
+XORG_LIB_XEVIE		:= libXevie-X11R7.1-$(XORG_LIB_XEVIE_VERSION)
 XORG_LIB_XEVIE_SUFFIX	:= tar.bz2
-XORG_LIB_XEVIE_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XEVIE).$(XORG_LIB_XEVIE_SUFFIX)
+XORG_LIB_XEVIE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 b8defd84b..acd71b168 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.0
-XORG_LIB_XEXT		:= libXext-X11R7.0-$(XORG_LIB_XEXT_VERSION)
+XORG_LIB_XEXT_VERSION	:= 1.0.1
+XORG_LIB_XEXT		:= libXext-X11R7.1-$(XORG_LIB_XEXT_VERSION)
 XORG_LIB_XEXT_SUFFIX	:= tar.bz2
-XORG_LIB_XEXT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XEXT).$(XORG_LIB_XEXT_SUFFIX)
+XORG_LIB_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 33667c717..32ab22728 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	:= 3.0.1.2
-XORG_LIB_XFIXES		:= libXfixes-X11R7.0-$(XORG_LIB_XFIXES_VERSION)
+XORG_LIB_XFIXES_VERSION	:= 4.0.1
+XORG_LIB_XFIXES		:= libXfixes-X11R7.1-$(XORG_LIB_XFIXES_VERSION)
 XORG_LIB_XFIXES_SUFFIX	:= tar.bz2
-XORG_LIB_XFIXES_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XFIXES).$(XORG_LIB_XFIXES_SUFFIX)
+XORG_LIB_XFIXES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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)
 
@@ -115,15 +115,15 @@ $(STATEDIR)/xorg-lib-Xfixes.targetinstall: $(xorg-lib-Xfixes_targetinstall_deps_
 	@$(call install_fixup, xorg-lib-Xfixes,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-lib-Xfixes, 0, 0, 0644, \
-		$(XORG_LIB_XFIXES_DIR)/src/.libs/libXfixes.so.3.0.0, \
-		$(XORG_LIBDIR)/libXfixes.so.3.0.0)
+		$(XORG_LIB_XFIXES_DIR)/src/.libs/libXfixes.so.3.1.0, \
+		$(XORG_LIBDIR)/libXfixes.so.3.1.0)
 
 	@$(call install_link, xorg-lib-Xfixes, \
-		libXfixes.so.3.0.0, \
+		libXfixes.so.3.1.0, \
 		$(XORG_LIBDIR)/libXfixes.so.3)
 
 	@$(call install_link, xorg-lib-Xfixes, \
-		libXfixes.so.3.0.0, \
+		libXfixes.so.3.1.0, \
 		$(XORG_LIBDIR)/libXfixes.so)
 
 	@$(call install_finish, xorg-lib-Xfixes)
diff --git a/rules/xorg-lib-Xfont.make b/rules/xorg-lib-Xfont.make
index 8c08eb2e6..404630e7d 100644
--- a/rules/xorg-lib-Xfont.make
+++ b/rules/xorg-lib-Xfont.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFONT) += xorg-lib-Xfont
 #
 # Paths and names
 #
-XORG_LIB_XFONT_VERSION	:= 1.0.0
-XORG_LIB_XFONT		:= libXfont-X11R7.0-$(XORG_LIB_XFONT_VERSION)
+XORG_LIB_XFONT_VERSION	:= 1.1.0
+XORG_LIB_XFONT		:= libXfont-X11R7.1-$(XORG_LIB_XFONT_VERSION)
 XORG_LIB_XFONT_SUFFIX	:= tar.bz2
-XORG_LIB_XFONT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
+XORG_LIB_XFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/lib/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
 XORG_LIB_XFONT_SOURCE	:= $(SRCDIR)/$(XORG_LIB_XFONT).$(XORG_LIB_XFONT_SUFFIX)
 XORG_LIB_XFONT_DIR	:= $(BUILDDIR)/$(XORG_LIB_XFONT)
 
diff --git a/rules/xorg-lib-Xfontcache.make b/rules/xorg-lib-Xfontcache.make
index ec461a4be..4da54640b 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.1
-XORG_LIB_XFONTCACHE		:= libXfontcache-X11R7.0-$(XORG_LIB_XFONTCACHE_VERSION)
+XORG_LIB_XFONTCACHE_VERSION	:= 1.0.2
+XORG_LIB_XFONTCACHE		:= libXfontcache-X11R7.1-$(XORG_LIB_XFONTCACHE_VERSION)
 XORG_LIB_XFONTCACHE_SUFFIX	:= tar.bz2
-XORG_LIB_XFONTCACHE_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XFONTCACHE).$(XORG_LIB_XFONTCACHE_SUFFIX)
+XORG_LIB_XFONTCACHE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 70e59e482..5748683aa 100644
--- a/rules/xorg-lib-Xft.make
+++ b/rules/xorg-lib-Xft.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XFT) += xorg-lib-Xft
 XORG_LIB_XFT_VERSION	:= 2.1.8.2
 XORG_LIB_XFT		:= libXft-X11R7.0-$(XORG_LIB_XFT_VERSION)
 XORG_LIB_XFT_SUFFIX	:= tar.bz2
-XORG_LIB_XFT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XFT).$(XORG_LIB_XFT_SUFFIX)
+XORG_LIB_XFT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 21f01c0f3..35db314b8 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.0
-XORG_LIB_XI		:= libXi-X11R7.0-$(XORG_LIB_XI_VERSION)
+XORG_LIB_XI_VERSION	:= 1.0.1
+XORG_LIB_XI		:= libXi-X11R7.1-$(XORG_LIB_XI_VERSION)
 XORG_LIB_XI_SUFFIX	:= tar.bz2
-XORG_LIB_XI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XI).$(XORG_LIB_XI_SUFFIX)
+XORG_LIB_XI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 7abd56fb0..2ba8bd530 100644
--- a/rules/xorg-lib-Xinerama.make
+++ b/rules/xorg-lib-Xinerama.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XINERAMA) += xorg-lib-Xinerama
 XORG_LIB_XINERAMA_VERSION	:= 1.0.1
 XORG_LIB_XINERAMA		:= libXinerama-X11R7.0-$(XORG_LIB_XINERAMA_VERSION)
 XORG_LIB_XINERAMA_SUFFIX	:= tar.bz2
-XORG_LIB_XINERAMA_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XINERAMA).$(XORG_LIB_XINERAMA_SUFFIX)
+XORG_LIB_XINERAMA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 703055592..2f5dc76b7 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.0
-XORG_LIB_XMU		:= libXmu-X11R7.0-$(XORG_LIB_XMU_VERSION)
+XORG_LIB_XMU_VERSION	:= 1.0.1
+XORG_LIB_XMU		:= libXmu-X11R7.1-$(XORG_LIB_XMU_VERSION)
 XORG_LIB_XMU_SUFFIX	:= tar.bz2
-XORG_LIB_XMU_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XMU).$(XORG_LIB_XMU_SUFFIX)
+XORG_LIB_XMU_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 e7b6110f9..0a82d3f3f 100644
--- a/rules/xorg-lib-Xp.make
+++ b/rules/xorg-lib-Xp.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XP) += xorg-lib-Xp
 XORG_LIB_XP_VERSION	:= 1.0.0
 XORG_LIB_XP		:= libXp-X11R7.0-$(XORG_LIB_XP_VERSION)
 XORG_LIB_XP_SUFFIX	:= tar.bz2
-XORG_LIB_XP_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XP).$(XORG_LIB_XP_SUFFIX)
+XORG_LIB_XP_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 0d4510238..52e41c9a0 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.4.2
-XORG_LIB_XPM		:= libXpm-X11R7.0-$(XORG_LIB_XPM_VERSION)
+XORG_LIB_XPM_VERSION	:= 3.5.5
+XORG_LIB_XPM		:= libXpm-X11R7.1-$(XORG_LIB_XPM_VERSION)
 XORG_LIB_XPM_SUFFIX	:= tar.bz2
-XORG_LIB_XPM_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XPM).$(XORG_LIB_XPM_SUFFIX)
+XORG_LIB_XPM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 bb24eefa7..205fa8c6d 100644
--- a/rules/xorg-lib-XprintAppUtil.make
+++ b/rules/xorg-lib-XprintAppUtil.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPRINTAPPUTIL) += xorg-lib-XprintAppUtil
 XORG_LIB_XPRINTAPPUTIL_VERSION	:= 1.0.1
 XORG_LIB_XPRINTAPPUTIL		:= libXprintAppUtil-X11R7.0-$(XORG_LIB_XPRINTAPPUTIL_VERSION)
 XORG_LIB_XPRINTAPPUTIL_SUFFIX	:= tar.bz2
-XORG_LIB_XPRINTAPPUTIL_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XPRINTAPPUTIL).$(XORG_LIB_XPRINTAPPUTIL_SUFFIX)
+XORG_LIB_XPRINTAPPUTIL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 82f24f73c..10b4c3eb7 100644
--- a/rules/xorg-lib-XprintUtil.make
+++ b/rules/xorg-lib-XprintUtil.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XPRINTUTIL) += xorg-lib-XprintUtil
 XORG_LIB_XPRINTUTIL_VERSION	:= 1.0.1
 XORG_LIB_XPRINTUTIL		:= libXprintUtil-X11R7.0-$(XORG_LIB_XPRINTUTIL_VERSION)
 XORG_LIB_XPRINTUTIL_SUFFIX	:= tar.bz2
-XORG_LIB_XPRINTUTIL_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XPRINTUTIL).$(XORG_LIB_XPRINTUTIL_SUFFIX)
+XORG_LIB_XPRINTUTIL_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 4144f6fe4..595606638 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.0.2
-XORG_LIB_XRANDR		:= libXrandr-X11R7.0-$(XORG_LIB_XRANDR_VERSION)
+XORG_LIB_XRANDR_VERSION	:= 1.1.1
+XORG_LIB_XRANDR		:= libXrandr-X11R7.1-$(XORG_LIB_XRANDR_VERSION)
 XORG_LIB_XRANDR_SUFFIX	:= tar.bz2
-XORG_LIB_XRANDR_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XRANDR).$(XORG_LIB_XRANDR_SUFFIX)
+XORG_LIB_XRANDR_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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)
 
diff --git a/rules/xorg-lib-Xrender.make b/rules/xorg-lib-Xrender.make
index bdfa1c012..dfa9874fd 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.0.2
-XORG_LIB_XRENDER		:= libXrender-X11R7.0-$(XORG_LIB_XRENDER_VERSION)
+XORG_LIB_XRENDER_VERSION	:= 0.9.1
+XORG_LIB_XRENDER		:= libXrender-X11R7.1-$(XORG_LIB_XRENDER_VERSION)
 XORG_LIB_XRENDER_SUFFIX		:= tar.bz2
-XORG_LIB_XRENDER_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XRENDER).$(XORG_LIB_XRENDER_SUFFIX)
+XORG_LIB_XRENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 b56285e02..b34069c41 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.0
-XORG_LIB_XRES		:= libXres-X11R7.0-$(XORG_LIB_XRES_VERSION)
+XORG_LIB_XRES_VERSION	:= 1.0.1
+XORG_LIB_XRES		:= libXres-X11R7.1-$(XORG_LIB_XRES_VERSION)
 XORG_LIB_XRES_SUFFIX	:= tar.bz2
-XORG_LIB_XRES_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XRES).$(XORG_LIB_XRES_SUFFIX)
+XORG_LIB_XRES_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 273936589..0244f4833 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.0
-XORG_LIB_XT		:= libXt-X11R7.0-$(XORG_LIB_XT_VERSION)
+XORG_LIB_XT_VERSION	:= 1.0.2
+XORG_LIB_XT		:= libXt-X11R7.1-$(XORG_LIB_XT_VERSION)
 XORG_LIB_XT_SUFFIX	:= tar.bz2
-XORG_LIB_XT_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XT).$(XORG_LIB_XT_SUFFIX)
+XORG_LIB_XT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 3294c1120..16ece5e8a 100644
--- a/rules/xorg-lib-Xtst.make
+++ b/rules/xorg-lib-Xtst.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTST) += xorg-lib-Xtst
 XORG_LIB_XTST_VERSION	:= 1.0.1
 XORG_LIB_XTST		:= libXtst-X11R7.0-$(XORG_LIB_XTST_VERSION)
 XORG_LIB_XTST_SUFFIX	:= tar.bz2
-XORG_LIB_XTST_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XTST).$(XORG_LIB_XTST_SUFFIX)
+XORG_LIB_XTST_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 0ecf68859..59b65945e 100644
--- a/rules/xorg-lib-Xv.make
+++ b/rules/xorg-lib-Xv.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XV) += xorg-lib-Xv
 XORG_LIB_XV_VERSION	:= 1.0.1
 XORG_LIB_XV		:= libXv-X11R7.0-$(XORG_LIB_XV_VERSION)
 XORG_LIB_XV_SUFFIX	:= tar.bz2
-XORG_LIB_XV_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XV).$(XORG_LIB_XV_SUFFIX)
+XORG_LIB_XV_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 ed415624f..b4865a672 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.1
-XORG_LIB_XVMC		:= libXvMC-X11R7.0-$(XORG_LIB_XVMC_VERSION)
+XORG_LIB_XVMC_VERSION	:= 1.0.2
+XORG_LIB_XVMC		:= libXvMC-X11R7.1-$(XORG_LIB_XVMC_VERSION)
 XORG_LIB_XVMC_SUFFIX	:= tar.bz2
-XORG_LIB_XVMC_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XVMC).$(XORG_LIB_XVMC_SUFFIX)
+XORG_LIB_XVMC_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 3635820c8..a5f658319 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.0
-XORG_LIB_XXF86DGA		:= libXxf86dga-X11R7.0-$(XORG_LIB_XXF86DGA_VERSION)
+XORG_LIB_XXF86DGA_VERSION	:= 1.0.1
+XORG_LIB_XXF86DGA		:= libXxf86dga-X11R7.1-$(XORG_LIB_XXF86DGA_VERSION)
 XORG_LIB_XXF86DGA_SUFFIX	:= tar.bz2
-XORG_LIB_XXF86DGA_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XXF86DGA).$(XORG_LIB_XXF86DGA_SUFFIX)
+XORG_LIB_XXF86DGA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 631165dbc..8f3077e48 100644
--- a/rules/xorg-lib-Xxf86misc.make
+++ b/rules/xorg-lib-Xxf86misc.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86MISC) += xorg-lib-Xxf86misc
 #
 # Paths and names
 #
-XORG_LIB_XXF86MISC_VERSION	:= 1.0.0
-XORG_LIB_XXF86MISC		:= libXxf86misc-X11R7.0-$(XORG_LIB_XXF86MISC_VERSION)
+XORG_LIB_XXF86MISC_VERSION	:= 1.0.1
+XORG_LIB_XXF86MISC		:= libXxf86misc-X11R7.1-$(XORG_LIB_XXF86MISC_VERSION)
 XORG_LIB_XXF86MISC_SUFFIX	:= tar.bz2
-XORG_LIB_XXF86MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XXF86MISC).$(XORG_LIB_XXF86MISC_SUFFIX)
+XORG_LIB_XXF86MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 b5335d16c..ce9b18974 100644
--- a/rules/xorg-lib-Xxf86vm.make
+++ b/rules/xorg-lib-Xxf86vm.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XXF86VM) += xorg-lib-Xxf86vm
 #
 # Paths and names
 #
-XORG_LIB_XXF86VM_VERSION	:= 1.0.0
-XORG_LIB_XXF86VM		:= libXxf86vm-X11R7.0-$(XORG_LIB_XXF86VM_VERSION)
+XORG_LIB_XXF86VM_VERSION	:= 1.0.1
+XORG_LIB_XXF86VM		:= libXxf86vm-X11R7.1-$(XORG_LIB_XXF86VM_VERSION)
 XORG_LIB_XXF86VM_SUFFIX		:= tar.bz2
-XORG_LIB_XXF86VM_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XXF86VM).$(XORG_LIB_XXF86VM_SUFFIX)
+XORG_LIB_XXF86VM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 af11b4ce3..7c9579636 100644
--- a/rules/xorg-lib-dmx.make
+++ b/rules/xorg-lib-dmx.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_DMX) += xorg-lib-dmx
 #
 # Paths and names
 #
-XORG_LIB_DMX_VERSION	:= 1.0.1
-XORG_LIB_DMX		:= libdmx-X11R7.0-$(XORG_LIB_DMX_VERSION)
+XORG_LIB_DMX_VERSION	:= 1.0.2
+XORG_LIB_DMX		:= libdmx-X11R7.1-$(XORG_LIB_DMX_VERSION)
 XORG_LIB_DMX_SUFFIX	:= tar.bz2
-XORG_LIB_DMX_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_DMX).$(XORG_LIB_DMX_SUFFIX)
+XORG_LIB_DMX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 7da619df0..4a769b22e 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.1
-XORG_LIB_FONTENC		:= libfontenc-X11R7.0-$(XORG_LIB_FONTENC_VERSION)
+XORG_LIB_FONTENC_VERSION	:= 1.0.2
+XORG_LIB_FONTENC		:= libfontenc-X11R7.1-$(XORG_LIB_FONTENC_VERSION)
 XORG_LIB_FONTENC_SUFFIX		:= tar.bz2
-XORG_LIB_FONTENC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_FONTENC).$(XORG_LIB_FONTENC_SUFFIX)
+XORG_LIB_FONTENC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 cc6a09d75..b16d5f92d 100644
--- a/rules/xorg-lib-lbxutil.make
+++ b/rules/xorg-lib-lbxutil.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_LBXUTIL) += xorg-lib-lbxutil
 #
 # Paths and names
 #
-XORG_LIB_LBXUTIL_VERSION	:= 1.0.0
-XORG_LIB_LBXUTIL		:= liblbxutil-X11R7.0-$(XORG_LIB_LBXUTIL_VERSION)
+XORG_LIB_LBXUTIL_VERSION	:= 1.0.1
+XORG_LIB_LBXUTIL		:= liblbxutil-X11R7.1-$(XORG_LIB_LBXUTIL_VERSION)
 XORG_LIB_LBXUTIL_SUFFIX		:= tar.bz2
-XORG_LIB_LBXUTIL_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_LBXUTIL).$(XORG_LIB_LBXUTIL_SUFFIX)
+XORG_LIB_LBXUTIL_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 ce38fdc86..4b6348a9b 100644
--- a/rules/xorg-lib-oldX.make
+++ b/rules/xorg-lib-oldX.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_OLDX) += xorg-lib-oldX
 XORG_LIB_OLDX_VERSION	:= 1.0.1
 XORG_LIB_OLDX		:= liboldX-X11R7.0-$(XORG_LIB_OLDX_VERSION)
 XORG_LIB_OLDX_SUFFIX	:= tar.bz2
-XORG_LIB_OLDX_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_OLDX).$(XORG_LIB_OLDX_SUFFIX)
+XORG_LIB_OLDX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 240225939..188cc42c9 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.1
-XORG_LIB_XKBFILE		:= libxkbfile-X11R7.0-$(XORG_LIB_XKBFILE_VERSION)
+XORG_LIB_XKBFILE_VERSION	:= 1.0.3
+XORG_LIB_XKBFILE		:= libxkbfile-X11R7.1-$(XORG_LIB_XKBFILE_VERSION)
 XORG_LIB_XKBFILE_SUFFIX		:= tar.bz2
-XORG_LIB_XKBFILE_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XKBFILE).$(XORG_LIB_XKBFILE_SUFFIX)
+XORG_LIB_XKBFILE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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)
 
@@ -115,15 +115,15 @@ $(STATEDIR)/xorg-lib-xkbfile.targetinstall: $(xorg-lib-xkbfile_targetinstall_dep
 	@$(call install_fixup, xorg-lib-xkbfile,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-lib-xkbfile, 0, 0, 0644, \
-		$(XORG_LIB_XKBFILE_DIR)/src/.libs/libxkbfile.so.1.0.0, \
-		$(XORG_LIBDIR)/libxkbfile.so.1.0.0)
+		$(XORG_LIB_XKBFILE_DIR)/src/.libs/libxkbfile.so.1.0.2, \
+		$(XORG_LIBDIR)/libxkbfile.so.1.0.2)
 
 	@$(call install_link, xorg-lib-xkbfile, \
-		libxkbfile.so.1.0.0, \
+		libxkbfile.so.1.0.2, \
 		$(XORG_LIBDIR)/libxkbfile.so.1)
 
 	@$(call install_link, xorg-lib-xkbfile, \
-		libxkbfile.so.1.0.0, \
+		libxkbfile.so.1.0.2, \
 		$(XORG_LIBDIR)/libxkbfile.so)
 
 	@$(call install_finish, xorg-lib-xkbfile)
diff --git a/rules/xorg-lib-xkbui.make b/rules/xorg-lib-xkbui.make
index ad2bcfaec..1ff036650 100644
--- a/rules/xorg-lib-xkbui.make
+++ b/rules/xorg-lib-xkbui.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_LIB_XKBUI) += xorg-lib-xkbui
 #
 # Paths and names
 #
-XORG_LIB_XKBUI_VERSION	:= 1.0.1
-XORG_LIB_XKBUI		:= libxkbui-X11R7.0-$(XORG_LIB_XKBUI_VERSION)
+XORG_LIB_XKBUI_VERSION	:= 1.0.2
+XORG_LIB_XKBUI		:= libxkbui-X11R7.1-$(XORG_LIB_XKBUI_VERSION)
 XORG_LIB_XKBUI_SUFFIX	:= tar.bz2
-XORG_LIB_XKBUI_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib/$(XORG_LIB_XKBUI).$(XORG_LIB_XKBUI_SUFFIX)
+XORG_LIB_XKBUI_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 91f1b5cb1..f5c26ad10 100644
--- a/rules/xorg-lib-xtrans.make
+++ b/rules/xorg-lib-xtrans.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_LIB_XTRANS) += xorg-lib-xtrans
 XORG_LIB_XTRANS_VERSION	:= 1.0.0
 XORG_LIB_XTRANS		:= xtrans-X11R7.0-$(XORG_LIB_XTRANS_VERSION)
 XORG_LIB_XTRANS_SUFFIX	:= tar.bz2
-XORG_LIB_XTRANS_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/lib//$(XORG_LIB_XTRANS).$(XORG_LIB_XTRANS_SUFFIX)
+XORG_LIB_XTRANS_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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-proto-applewm.make b/rules/xorg-proto-applewm.make
index 1cd35dc3d..1424b6984 100644
--- a/rules/xorg-proto-applewm.make
+++ b/rules/xorg-proto-applewm.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_APPLEWM) += xorg-proto-applewm
 XORG_PROTO_APPLEWM_VERSION	:= 1.0.3
 XORG_PROTO_APPLEWM		:= applewmproto-X11R7.0-$(XORG_PROTO_APPLEWM_VERSION)
 XORG_PROTO_APPLEWM_SUFFIX	:= tar.bz2
-XORG_PROTO_APPLEWM_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_APPLEWM).$(XORG_PROTO_APPLEWM_SUFFIX)
+XORG_PROTO_APPLEWM_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 10c616e2f..29423c9c6 100644
--- a/rules/xorg-proto-bigreqs.make
+++ b/rules/xorg-proto-bigreqs.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_BIGREQS) += xorg-proto-bigreqs
 XORG_PROTO_BIGREQS_VERSION	:= 1.0.2
 XORG_PROTO_BIGREQS		:= bigreqsproto-X11R7.0-$(XORG_PROTO_BIGREQS_VERSION)
 XORG_PROTO_BIGREQS_SUFFIX	:= tar.bz2
-XORG_PROTO_BIGREQS_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_BIGREQS).$(XORG_PROTO_BIGREQS_SUFFIX)
+XORG_PROTO_BIGREQS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 161651539..622455d4d 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.2.2
-XORG_PROTO_COMPOSITE		:= compositeproto-X11R7.0-$(XORG_PROTO_COMPOSITE_VERSION)
+XORG_PROTO_COMPOSITE_VERSION 	:= 0.3.1
+XORG_PROTO_COMPOSITE		:= compositeproto-X11R7.1-$(XORG_PROTO_COMPOSITE_VERSION)
 XORG_PROTO_COMPOSITE_SUFFIX	:= tar.bz2
-XORG_PROTO_COMPOSITE_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_COMPOSITE).$(XORG_PROTO_COMPOSITE_SUFFIX)
+XORG_PROTO_COMPOSITE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 8d6ce79a4..37c6ab05c 100644
--- a/rules/xorg-proto-damage.make
+++ b/rules/xorg-proto-damage.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_DAMAGE) += xorg-proto-damage
 XORG_PROTO_DAMAGE_VERSION	:= 1.0.3
 XORG_PROTO_DAMAGE		:= damageproto-X11R7.0-$(XORG_PROTO_DAMAGE_VERSION)
 XORG_PROTO_DAMAGE_SUFFIX	:= tar.bz2
-XORG_PROTO_DAMAGE_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_DAMAGE).$(XORG_PROTO_DAMAGE_SUFFIX)
+XORG_PROTO_DAMAGE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 d96b030a1..f1059e7c2 100644
--- a/rules/xorg-proto-dmx.make
+++ b/rules/xorg-proto-dmx.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_DMX) += xorg-proto-dmx
 XORG_PROTO_DMX_VERSION	:= 2.2.2
 XORG_PROTO_DMX		:= dmxproto-X11R7.0-$(XORG_PROTO_DMX_VERSION)
 XORG_PROTO_DMX_SUFFIX	:= tar.bz2
-XORG_PROTO_DMX_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_DMX).$(XORG_PROTO_DMX_SUFFIX)
+XORG_PROTO_DMX_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 1d7d2d3e5..1210e47df 100644
--- a/rules/xorg-proto-evieext.make
+++ b/rules/xorg-proto-evieext.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_EVIEEXT) += xorg-proto-evieext
 XORG_PROTO_EVIEEXT_VERSION	:= 1.0.2
 XORG_PROTO_EVIEEXT		:= evieext-X11R7.0-$(XORG_PROTO_EVIEEXT_VERSION)
 XORG_PROTO_EVIEEXT_SUFFIX	:= tar.bz2
-XORG_PROTO_EVIEEXT_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_EVIEEXT).$(XORG_PROTO_EVIEEXT_SUFFIX)
+XORG_PROTO_EVIEEXT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 e887f717e..5e7ea3b68 100644
--- a/rules/xorg-proto-fixes.make
+++ b/rules/xorg-proto-fixes.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FIXES) += xorg-proto-fixes
 #
 # Paths and names
 #
-XORG_PROTO_FIXES_VERSION	:= 3.0.2
-XORG_PROTO_FIXES		:= fixesproto-X11R7.0-$(XORG_PROTO_FIXES_VERSION)
+XORG_PROTO_FIXES_VERSION	:= 4.0
+XORG_PROTO_FIXES		:= fixesproto-X11R7.1-$(XORG_PROTO_FIXES_VERSION)
 XORG_PROTO_FIXES_SUFFIX		:= tar.bz2
-XORG_PROTO_FIXES_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_FIXES).$(XORG_PROTO_FIXES_SUFFIX)
+XORG_PROTO_FIXES_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 d89a9bc61..1d086b0e9 100644
--- a/rules/xorg-proto-fontcache.make
+++ b/rules/xorg-proto-fontcache.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FONTCACHE) += xorg-proto-fontcache
 XORG_PROTO_FONTCACHE_VERSION	:= 0.1.2
 XORG_PROTO_FONTCACHE		:= fontcacheproto-X11R7.0-$(XORG_PROTO_FONTCACHE_VERSION)
 XORG_PROTO_FONTCACHE_SUFFIX	:= tar.bz2
-XORG_PROTO_FONTCACHE_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_FONTCACHE).$(XORG_PROTO_FONTCACHE_SUFFIX)
+XORG_PROTO_FONTCACHE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 dd9e42651..2fc6b7c39 100644
--- a/rules/xorg-proto-fonts.make
+++ b/rules/xorg-proto-fonts.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_FONTS) += xorg-proto-fonts
 XORG_PROTO_FONTS_VERSION	:= 2.0.2
 XORG_PROTO_FONTS		:= fontsproto-X11R7.0-$(XORG_PROTO_FONTS_VERSION)
 XORG_PROTO_FONTS_SUFFIX		:= tar.bz2
-XORG_PROTO_FONTS_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_FONTS).$(XORG_PROTO_FONTS_SUFFIX)
+XORG_PROTO_FONTS_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 a3fa801da..502c9e422 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.3
-XORG_PROTO_GL		:= glproto-X11R7.0-$(XORG_PROTO_GL_VERSION)
+XORG_PROTO_GL_VERSION 	:= 1.4.7
+XORG_PROTO_GL		:= glproto-X11R7.1-$(XORG_PROTO_GL_VERSION)
 XORG_PROTO_GL_SUFFIX	:= tar.bz2
-XORG_PROTO_GL_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_GL).$(XORG_PROTO_GL_SUFFIX)
+XORG_PROTO_GL_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 0d968129f..61280ee7a 100644
--- a/rules/xorg-proto-input.make
+++ b/rules/xorg-proto-input.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_INPUT) += xorg-proto-input
 XORG_PROTO_INPUT_VERSION:= 1.3.2
 XORG_PROTO_INPUT	:= inputproto-X11R7.0-$(XORG_PROTO_INPUT_VERSION)
 XORG_PROTO_INPUT_SUFFIX	:= tar.bz2
-XORG_PROTO_INPUT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_INPUT).$(XORG_PROTO_INPUT_SUFFIX)
+XORG_PROTO_INPUT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 c8eaa42ac..20e963b7f 100644
--- a/rules/xorg-proto-kb.make
+++ b/rules/xorg-proto-kb.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_KB) += xorg-proto-kb
 XORG_PROTO_KB_VERSION 	:= 1.0.2
 XORG_PROTO_KB		:= kbproto-X11R7.0-$(XORG_PROTO_KB_VERSION)
 XORG_PROTO_KB_SUFFIX	:= tar.bz2
-XORG_PROTO_KB_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_KB).$(XORG_PROTO_KB_SUFFIX)
+XORG_PROTO_KB_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 2b6b195bd..d7533ca84 100644
--- a/rules/xorg-proto-print.make
+++ b/rules/xorg-proto-print.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_PRINT) += xorg-proto-print
 XORG_PROTO_PRINT_VERSION:= 1.0.3
 XORG_PROTO_PRINT	:= printproto-X11R7.0-$(XORG_PROTO_PRINT_VERSION)
 XORG_PROTO_PRINT_SUFFIX	:= tar.bz2
-XORG_PROTO_PRINT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_PRINT).$(XORG_PROTO_PRINT_SUFFIX)
+XORG_PROTO_PRINT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 c66403fde..619df2ca5 100644
--- a/rules/xorg-proto-randr.make
+++ b/rules/xorg-proto-randr.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RANDR) += xorg-proto-randr
 XORG_PROTO_RANDR_VERSION:= 1.1.2
 XORG_PROTO_RANDR	:= randrproto-X11R7.0-$(XORG_PROTO_RANDR_VERSION)
 XORG_PROTO_RANDR_SUFFIX	:= tar.bz2
-XORG_PROTO_RANDR_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_RANDR).$(XORG_PROTO_RANDR_SUFFIX)
+XORG_PROTO_RANDR_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 fc802f6a3..1249bb5ba 100644
--- a/rules/xorg-proto-record.make
+++ b/rules/xorg-proto-record.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RECORD) += xorg-proto-record
 XORG_PROTO_RECORD_VERSION	:= 1.13.2
 XORG_PROTO_RECORD		:= recordproto-X11R7.0-$(XORG_PROTO_RECORD_VERSION)
 XORG_PROTO_RECORD_SUFFIX	:= tar.bz2
-XORG_PROTO_RECORD_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_RECORD).$(XORG_PROTO_RECORD_SUFFIX)
+XORG_PROTO_RECORD_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 f7dfafb4c..a9f70cada 100644
--- a/rules/xorg-proto-render.make
+++ b/rules/xorg-proto-render.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RENDER) += xorg-proto-render
 XORG_PROTO_RENDER_VERSION	:= 0.9.2
 XORG_PROTO_RENDER		:= renderproto-X11R7.0-$(XORG_PROTO_RENDER_VERSION)
 XORG_PROTO_RENDER_SUFFIX	:= tar.bz2
-XORG_PROTO_RENDER_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_RENDER).$(XORG_PROTO_RENDER_SUFFIX)
+XORG_PROTO_RENDER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 c33e6bbc7..0a994a8db 100644
--- a/rules/xorg-proto-resource.make
+++ b/rules/xorg-proto-resource.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_RESOURCE) += xorg-proto-resource
 XORG_PROTO_RESOURCE_VERSION	:= 1.0.2
 XORG_PROTO_RESOURCE		:= resourceproto-X11R7.0-$(XORG_PROTO_RESOURCE_VERSION)
 XORG_PROTO_RESOURCE_SUFFIX	:= tar.bz2
-XORG_PROTO_RESOURCE_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_RESOURCE).$(XORG_PROTO_RESOURCE_SUFFIX)
+XORG_PROTO_RESOURCE_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 62960ef90..f6b2ebdac 100644
--- a/rules/xorg-proto-scrnsaver.make
+++ b/rules/xorg-proto-scrnsaver.make
@@ -17,10 +17,10 @@ PACKAGES-$(PTXCONF_XORG_PROTO_SCRNSAVER) += xorg-proto-scrnsaver
 #
 # Paths and names
 #
-XORG_PROTO_SCRNSAVER_VERSION 	:= 1.0.2
-XORG_PROTO_SCRNSAVER		:= scrnsaverproto-X11R7.0-$(XORG_PROTO_SCRNSAVER_VERSION)
+XORG_PROTO_SCRNSAVER_VERSION 	:= 1.1.0
+XORG_PROTO_SCRNSAVER		:= scrnsaverproto-X11R7.1-$(XORG_PROTO_SCRNSAVER_VERSION)
 XORG_PROTO_SCRNSAVER_SUFFIX	:= tar.bz2
-XORG_PROTO_SCRNSAVER_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_SCRNSAVER).$(XORG_PROTO_SCRNSAVER_SUFFIX)
+XORG_PROTO_SCRNSAVER_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 a254d7b5a..6da46678e 100644
--- a/rules/xorg-proto-trap.make
+++ b/rules/xorg-proto-trap.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_TRAP) += xorg-proto-trap
 XORG_PROTO_TRAP_VERSION := 3.4.3
 XORG_PROTO_TRAP		:= trapproto-X11R7.0-$(XORG_PROTO_TRAP_VERSION)
 XORG_PROTO_TRAP_SUFFIX	:= tar.bz2
-XORG_PROTO_TRAP_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_TRAP).$(XORG_PROTO_TRAP_SUFFIX)
+XORG_PROTO_TRAP_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 380bc12ce..9e1bc0915 100644
--- a/rules/xorg-proto-video.make
+++ b/rules/xorg-proto-video.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_VIDEO) += xorg-proto-video
 XORG_PROTO_VIDEO_VERSION:= 2.2.2
 XORG_PROTO_VIDEO	:= videoproto-X11R7.0-$(XORG_PROTO_VIDEO_VERSION)
 XORG_PROTO_VIDEO_SUFFIX	:= tar.bz2
-XORG_PROTO_VIDEO_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_VIDEO).$(XORG_PROTO_VIDEO_SUFFIX)
+XORG_PROTO_VIDEO_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 0e3714e7a..97a93bc91 100644
--- a/rules/xorg-proto-windowswm.make
+++ b/rules/xorg-proto-windowswm.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_WINDOWSWM) += xorg-proto-windowswm
 XORG_PROTO_WINDOWSWM_VERSION 	:= 1.0.3
 XORG_PROTO_WINDOWSWM		:= windowswmproto-X11R7.0-$(XORG_PROTO_WINDOWSWM_VERSION)
 XORG_PROTO_WINDOWSWM_SUFFIX	:= tar.bz2
-XORG_PROTO_WINDOWSWM_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_WINDOWSWM).$(XORG_PROTO_WINDOWSWM_SUFFIX)
+XORG_PROTO_WINDOWSWM_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 356729ee3..e7d67dba7 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.4
-XORG_PROTO_X		:= xproto-X11R7.0-$(XORG_PROTO_X_VERSION)
+XORG_PROTO_X_VERSION 	:= 7.0.5
+XORG_PROTO_X		:= xproto-X11R7.1-$(XORG_PROTO_X_VERSION)
 XORG_PROTO_X_SUFFIX	:= tar.bz2
-XORG_PROTO_X_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_X).$(XORG_PROTO_X_SUFFIX)
+XORG_PROTO_X_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/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 86bb6a9ce..176dd1769 100644
--- a/rules/xorg-proto-xcmisc.make
+++ b/rules/xorg-proto-xcmisc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XCMISC) += xorg-proto-xcmisc
 XORG_PROTO_XCMISC_VERSION	:= 1.1.2
 XORG_PROTO_XCMISC		:= xcmiscproto-X11R7.0-$(XORG_PROTO_XCMISC_VERSION)
 XORG_PROTO_XCMISC_SUFFIX	:= tar.bz2
-XORG_PROTO_XCMISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XCMISC).$(XORG_PROTO_XCMISC_SUFFIX)
+XORG_PROTO_XCMISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 af75df949..b7276236f 100644
--- a/rules/xorg-proto-xext.make
+++ b/rules/xorg-proto-xext.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XEXT) += xorg-proto-xext
 XORG_PROTO_XEXT_VERSION := 7.0.2
 XORG_PROTO_XEXT		:= xextproto-X11R7.0-$(XORG_PROTO_XEXT_VERSION)
 XORG_PROTO_XEXT_SUFFIX	:= tar.bz2
-XORG_PROTO_XEXT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XEXT).$(XORG_PROTO_XEXT_SUFFIX)
+XORG_PROTO_XEXT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 5efa8c3a2..0343cae4a 100644
--- a/rules/xorg-proto-xf86bigfont.make
+++ b/rules/xorg-proto-xf86bigfont.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86BIGFONT) += xorg-proto-xf86bigfont
 XORG_PROTO_XF86BIGFONT_VERSION	:= 1.1.2
 XORG_PROTO_XF86BIGFONT		:= xf86bigfontproto-X11R7.0-$(XORG_PROTO_XF86BIGFONT_VERSION)
 XORG_PROTO_XF86BIGFONT_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86BIGFONT_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XF86BIGFONT).$(XORG_PROTO_XF86BIGFONT_SUFFIX)
+XORG_PROTO_XF86BIGFONT_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 0d4bca201..8e3577373 100644
--- a/rules/xorg-proto-xf86dga.make
+++ b/rules/xorg-proto-xf86dga.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86DGA) += xorg-proto-xf86dga
 XORG_PROTO_XF86DGA_VERSION	:= 2.0.2
 XORG_PROTO_XF86DGA		:= xf86dgaproto-X11R7.0-$(XORG_PROTO_XF86DGA_VERSION)
 XORG_PROTO_XF86DGA_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86DGA_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XF86DGA).$(XORG_PROTO_XF86DGA_SUFFIX)
+XORG_PROTO_XF86DGA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 7fa7bb79d..dbe1747ed 100644
--- a/rules/xorg-proto-xf86dri.make
+++ b/rules/xorg-proto-xf86dri.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86DRI) += xorg-proto-xf86dri
 XORG_PROTO_XF86DRI_VERSION	:= 2.0.3
 XORG_PROTO_XF86DRI		:= xf86driproto-X11R7.0-$(XORG_PROTO_XF86DRI_VERSION)
 XORG_PROTO_XF86DRI_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86DRI_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XF86DRI).$(XORG_PROTO_XF86DRI_SUFFIX)
+XORG_PROTO_XF86DRI_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 2647f4896..51f0412b8 100644
--- a/rules/xorg-proto-xf86misc.make
+++ b/rules/xorg-proto-xf86misc.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86MISC) += xorg-proto-xf86misc
 XORG_PROTO_XF86MISC_VERSION	:= 0.9.2
 XORG_PROTO_XF86MISC		:= xf86miscproto-X11R7.0-$(XORG_PROTO_XF86MISC_VERSION)
 XORG_PROTO_XF86MISC_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86MISC_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XF86MISC).$(XORG_PROTO_XF86MISC_SUFFIX)
+XORG_PROTO_XF86MISC_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 7583c9108..d4b061f98 100644
--- a/rules/xorg-proto-xf86rush.make
+++ b/rules/xorg-proto-xf86rush.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86RUSH) += xorg-proto-xf86rush
 XORG_PROTO_XF86RUSH_VERSION	:= 1.1.2
 XORG_PROTO_XF86RUSH		:= xf86rushproto-X11R7.0-$(XORG_PROTO_XF86RUSH_VERSION)
 XORG_PROTO_XF86RUSH_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86RUSH_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XF86RUSH).$(XORG_PROTO_XF86RUSH_SUFFIX)
+XORG_PROTO_XF86RUSH_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 5c857b7d0..abbf73aed 100644
--- a/rules/xorg-proto-xf86vidmode.make
+++ b/rules/xorg-proto-xf86vidmode.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XF86VIDMODE) += xorg-proto-xf86vidmode
 XORG_PROTO_XF86VIDMODE_VERSION	:= 2.2.2
 XORG_PROTO_XF86VIDMODE		:= xf86vidmodeproto-X11R7.0-$(XORG_PROTO_XF86VIDMODE_VERSION)
 XORG_PROTO_XF86VIDMODE_SUFFIX	:= tar.bz2
-XORG_PROTO_XF86VIDMODE_URL	:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XF86VIDMODE).$(XORG_PROTO_XF86VIDMODE_SUFFIX)
+XORG_PROTO_XF86VIDMODE_URL	:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 197f1aff8..b4841b67b 100644
--- a/rules/xorg-proto-xinerama.make
+++ b/rules/xorg-proto-xinerama.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XINERAMA) += xorg-proto-xinerama
 XORG_PROTO_XINERAMA_VERSION 	:= 1.1.2
 XORG_PROTO_XINERAMA		:= xineramaproto-X11R7.0-$(XORG_PROTO_XINERAMA_VERSION)
 XORG_PROTO_XINERAMA_SUFFIX	:= tar.bz2
-XORG_PROTO_XINERAMA_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XINERAMA).$(XORG_PROTO_XINERAMA_SUFFIX)
+XORG_PROTO_XINERAMA_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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 b1a243abf..0cb87e3b6 100644
--- a/rules/xorg-proto-xproxymanagement.make
+++ b/rules/xorg-proto-xproxymanagement.make
@@ -20,7 +20,7 @@ PACKAGES-$(PTXCONF_XORG_PROTO_XPROXYMANAGEMENT) += xorg-proto-xproxymanagement
 XORG_PROTO_XPROXYMANAGEMENT_VERSION	:= 1.0.2
 XORG_PROTO_XPROXYMANAGEMENT		:= xproxymanagementprotocol-X11R7.0-$(XORG_PROTO_XPROXYMANAGEMENT_VERSION)
 XORG_PROTO_XPROXYMANAGEMENT_SUFFIX	:= tar.bz2
-XORG_PROTO_XPROXYMANAGEMENT_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/proto/$(XORG_PROTO_XPROXYMANAGEMENT).$(XORG_PROTO_XPROXYMANAGEMENT_SUFFIX)
+XORG_PROTO_XPROXYMANAGEMENT_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.0/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-server.make b/rules/xorg-server.make
index a92648ead..0f5d22d09 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.0.1
-XORG_SERVER		:= xorg-server-X11R7.0-$(XORG_SERVER_VERSION)
+XORG_SERVER_VERSION	:= 1.1.0
+XORG_SERVER		:= xorg-server-X11R7.1-$(XORG_SERVER_VERSION)
 XORG_SERVER_SUFFIX	:= tar.bz2
-XORG_SERVER_URL		:= ftp://ftp.gwdg.de/pub/x11/x.org/pub/X11R7.0/src/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
+XORG_SERVER_URL		:= $(PTXCONF_SETUP_XORGMIRROR)/X11R7.1/src/xserver/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
 XORG_SERVER_SOURCE	:= $(SRCDIR)/$(XORG_SERVER).$(XORG_SERVER_SUFFIX)
 XORG_SERVER_DIR		:= $(BUILDDIR)/$(XORG_SERVER)
 
@@ -368,7 +368,7 @@ 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/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/libcfb24.so, $(XORG_PREFIX)/lib/xorg/modules/libcfb24.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)
@@ -376,7 +376,7 @@ ifdef PTXCONF_XORG_DRIVER_VIDEO
 	@$(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/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/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)
@@ -391,7 +391,7 @@ ifdef PTXCONF_XORG_DRIVER_VIDEO
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/xf4bpp/.libs/libxf4bpp.so, $(XORG_PREFIX)/lib/xorg/modules/libxf4bpp.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/xf8_16bpp/.libs/libxf8_16bpp.so, $(XORG_PREFIX)/lib/xorg/modules/libxf8_16bpp.so)
 	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/xf8_32bpp/.libs/libxf8_32bpp.so, $(XORG_PREFIX)/lib/xorg/modules/libxf8_32bpp.so)
-	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/xf8_32wid/.libs/libxf8_32wid.so, $(XORG_PREFIX)/lib/xorg/modules/libxf8_32wid.so)
+#	@$(call install_copy, xorg-server, 0, 0, 0755, $(XORG_SERVER_DIR)/hw/xfree86/xf8_32wid/.libs/libxf8_32wid.so, $(XORG_PREFIX)/lib/xorg/modules/libxf8_32wid.so)
 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)
author	Luotao Fu <l.fu@pengutronix.de>	2006-06-19 15:30:00 +0000
committer	Luotao Fu <l.fu@pengutronix.de>	2006-06-19 15:30:00 +0000
commit	5450510229001c331e13e7cf783b89208c765874 (patch)
tree	28b4c6b1c9f2f88fe6437c9ed8169766cab4dc11 /rules
parent	75f43a7cb50cb0eff7ea0c27ef72896fbe2528c4 (diff)
download	ptxdist-5450510229001c331e13e7cf783b89208c765874.tar.gz ptxdist-5450510229001c331e13e7cf783b89208c765874.tar.xz