diff --git a/x11/libXp/Makefile b/x11/libXp/Makefile
index 336e9d5765ad..1d0c7cd87cbb 100644
--- a/x11/libXp/Makefile
+++ b/x11/libXp/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	libXp
 PORTVERSION=	6.0
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
+MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
+		${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.7/tars
 DISTNAME=	X11R6.7.0-src1
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libXxf86/Makefile b/x11/libXxf86/Makefile
index a7e9b325ae2a..ba6b9d433f72 100644
--- a/x11/libXxf86/Makefile
+++ b/x11/libXxf86/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	libXxf86
 PORTVERSION=	1.0
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
+MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
+		${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.7/tars
 DISTNAME=	X11R6.7.0-src1
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/libxkbfile/Makefile b/x11/libxkbfile/Makefile
index d7915a0c3851..b944ea7dc81c 100644
--- a/x11/libxkbfile/Makefile
+++ b/x11/libxkbfile/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	libxkbfile
 PORTVERSION=	1.0
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
+MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
+		${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.7/tars
 DISTNAME=	X11R6.7.0-src1
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11/xf86ext/Makefile b/x11/xf86ext/Makefile
index 8e31a63bd841..4f1240a27765 100644
--- a/x11/xf86ext/Makefile
+++ b/x11/xf86ext/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	xf86ext
 PORTVERSION=	1.0
 CATEGORIES=	x11
-MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/
+MASTER_SITES=	http://xorg.freedesktop.org/X11R6.7.0/src/ \
+		${MASTER_SITE_XORG}
+MASTER_SITE_SUBDIR=	X11R6.7/tars
 DISTNAME=	X11R6.7.0-src1
 
 MAINTAINER=	x11@FreeBSD.org