diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 15b53d51b6e2..83aaaca54602 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	imake
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0
diff --git a/devel/imake-4/scripts/configure b/devel/imake-4/scripts/configure
index a7d082d5b3f1..9dd35d5a285c 100644
--- a/devel/imake-4/scripts/configure
+++ b/devel/imake-4/scripts/configure
@@ -23,11 +23,9 @@ if [ $OSVERSION -ge 300000 -a X$HasSecureRPC != "X" ]; then
     echo "#endif"                               >> $F
 fi
 if [ X$HasXdmAuth != "X" ]; then
-    if [ -f $WRKDIR/xc/lib/Xdmcp/Wraphelp.c -o -f $DISTDIR/xc/Wraphelp.c ]; then
-	echo "#ifndef HasXdmAuth"               >> $F
-	echo "#define HasXdmAuth $HasXdmAuth" >> $F
-        echo "#endif"                           >> $F
-    fi
+    echo "#ifndef HasXdmAuth"               >> $F
+    echo "#define HasXdmAuth $HasXdmAuth" >> $F
+    echo "#endif"                           >> $F
 fi
 if [ $OSVERSION -ge 310000 -a X$HasPam != "X" ]; then
     echo "#ifndef HasPam"                       >> $F
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 69935c4cf446..416b9c5dc90f 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	NestServer
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0
@@ -26,6 +27,23 @@ INSTALL_TARGET=		installXnest installXserver.man
 MANCOMPRESSED=		yes
 MAN1=			Xnest.1 Xserver.1
 
+HasXdmAuth?=		DEFAULT
+
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+pre-fetch:
+	@${ECHO}
+	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+.else
+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=	X410src-1.tgz
+DISTFILES+=	Wraphelp.c
+IGNOREFILES=	Wraphelp.c
+.endif
+.endif
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/x11-servers/XFree86-4-NestServer/distinfo b/x11-servers/XFree86-4-NestServer/distinfo
index e4b5e84b9421..942f997451ad 100644
--- a/x11-servers/XFree86-4-NestServer/distinfo
+++ b/x11-servers/XFree86-4-NestServer/distinfo
@@ -1 +1,2 @@
 MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index f9e5b8e9ad4c..ca506c4c85a4 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	PrintServer
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0
@@ -24,6 +25,23 @@ MAKE_ENV=		MAN_INSTALL_TARGET=NOOP
 ALL_TARGET=		FreeBSDPortsBuild
 INSTALL_TARGET=		installXprt
 
+HasXdmAuth?=		DEFAULT
+
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+pre-fetch:
+	@${ECHO}
+	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+.else
+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=	X410src-1.tgz
+DISTFILES+=	Wraphelp.c
+IGNOREFILES=	Wraphelp.c
+.endif
+.endif
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/x11-servers/XFree86-4-PrintServer/distinfo b/x11-servers/XFree86-4-PrintServer/distinfo
index e4b5e84b9421..942f997451ad 100644
--- a/x11-servers/XFree86-4-PrintServer/distinfo
+++ b/x11-servers/XFree86-4-PrintServer/distinfo
@@ -1 +1,2 @@
 MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 6aa58229950d..ffcbe67b81ac 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -154,6 +154,23 @@ post-install::
 .endif	# !WITH_MATROX_GXX_DRIVER
 .endif
 
+HasXdmAuth?=		DEFAULT
+
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+pre-fetch:
+	@${ECHO}
+	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+.else
+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=	X410src-1.tgz
+DISTFILES+=	Wraphelp.c
+IGNOREFILES=	Wraphelp.c
+.endif
+.endif
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index 8e671ced5d59..9b56bde72df7 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,2 +1,3 @@
 MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/Wraphelp.c) = IGNORE
 MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 6aa58229950d..ffcbe67b81ac 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -154,6 +154,23 @@ post-install::
 .endif	# !WITH_MATROX_GXX_DRIVER
 .endif
 
+HasXdmAuth?=		DEFAULT
+
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+pre-fetch:
+	@${ECHO}
+	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+.else
+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=	X410src-1.tgz
+DISTFILES+=	Wraphelp.c
+IGNOREFILES=	Wraphelp.c
+.endif
+.endif
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index 8e671ced5d59..9b56bde72df7 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,2 +1,3 @@
 MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/Wraphelp.c) = IGNORE
 MD5 (xc/mga-133_143-source.tgz) = 849bf57f23f1684fea970459f919d1f2
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index 90c2c09d09f2..ce829d316c39 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	VirtualFramebufferServer
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0
@@ -25,6 +26,23 @@ INSTALL_TARGET=		installXvfb installXserver.man
 MAKE_ENV=		MAN_INSTALL_TARGET=installXvfb.man
 MAN1=			Xserver.1 Xvfb.1
 
+HasXdmAuth?=		DEFAULT
+
+.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
+.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
+pre-fetch:
+	@${ECHO}
+	@${ECHO} Assuming that you have fetched a USA-Legal Wraphelp.c.
+.else
+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=	X410src-1.tgz
+DISTFILES+=	Wraphelp.c
+IGNOREFILES=	Wraphelp.c
+.endif
+.endif
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
index e4b5e84b9421..942f997451ad 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/distinfo
@@ -1 +1,2 @@
 MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 2a806513cf5d..77b01abbbd77 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clients
 PORTVERSION=	4.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 482d5a039404..fa2b0e0a8ff3 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libraries
 PORTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
 MASTER_SITE_SUBDIR=	4.1.0