diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index c450f394a9dd..73bb599f7365 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.5
+# Version required:     3.3.6
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.5
+PKGNAME= 	XFree86-3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.5/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.5/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.5/source/
-DISTFILES=	X335src-1.tgz X335src-2.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
@@ -50,7 +50,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X335src-1.tgz X335src-2.tgz
+EXTRACT_ONLY=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index c450f394a9dd..73bb599f7365 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.5
+# Version required:     3.3.6
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.5
+PKGNAME= 	XFree86-3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.5/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.5/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.5/source/
-DISTFILES=	X335src-1.tgz X335src-2.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
@@ -50,7 +50,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X335src-1.tgz X335src-2.tgz
+EXTRACT_ONLY=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index c450f394a9dd..73bb599f7365 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.5
+# Version required:     3.3.6
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.5
+PKGNAME= 	XFree86-3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.5/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.5/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.5/source/
-DISTFILES=	X335src-1.tgz X335src-2.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
@@ -50,7 +50,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X335src-1.tgz X335src-2.tgz
+EXTRACT_ONLY=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index c450f394a9dd..73bb599f7365 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.5
+# Version required:     3.3.6
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.5
+PKGNAME= 	XFree86-3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.5/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.5/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.5/source/
-DISTFILES=	X335src-1.tgz X335src-2.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
@@ -50,7 +50,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X335src-1.tgz X335src-2.tgz
+EXTRACT_ONLY=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index c450f394a9dd..73bb599f7365 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.5
+# Version required:     3.3.6
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.5
+PKGNAME= 	XFree86-3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.5/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.5/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.5/source/
-DISTFILES=	X335src-1.tgz X335src-2.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
@@ -50,7 +50,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X335src-1.tgz X335src-2.tgz
+EXTRACT_ONLY=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index c450f394a9dd..73bb599f7365 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -1,5 +1,5 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.5
+# Version required:     3.3.6
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
@@ -7,14 +7,14 @@
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.5
+PKGNAME= 	XFree86-3.3.6
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.5/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.5/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.5/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.5/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.5/source/
-DISTFILES=	X335src-1.tgz X335src-2.tgz
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.6/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
+DISTFILES=	X336src-1.tgz X336src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
 
@@ -50,7 +50,7 @@ pre-fetch:
 MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
 		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
 		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X335src-1.tgz X335src-2.tgz
+EXTRACT_ONLY=	X336src-1.tgz X336src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif