diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index 54cdd70f89fb..f444b29abefd 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -12,17 +12,26 @@ buildenv () {
     	export PKGSUFFIX=.tgz
     	export PKGZIPCMD=gzip
 	export INDEXFILE=INDEX
+	export XFREE86_VERSION=4
 	    ;;
 	x4-exp)
     	export PKGSUFFIX=.tgz
     	export PKGZIPCMD=gzip
 	export PORTS_AUDIT=1
 	export INDEXFILE=INDEX
+	export XFREE86_VERSION=4
 	    ;;
 	x5)
     	export PKGSUFFIX=.tbz
     	export PKGZIPCMD=bzip2
 	export INDEXFILE=INDEX-5
+	export X_WINDOW_SYSTEM=xorg
+	    ;;
+	x6)
+    	export PKGSUFFIX=.tbz
+    	export PKGZIPCMD=bzip2
+	export INDEXFILE=INDEX-6
+	export X_WINDOW_SYSTEM=xorg
 	    ;;
 	*)
 	    echo "buildenv: invalid branch"
@@ -33,8 +42,6 @@ buildenv () {
     export ARCH=${arch}
     export MACHINE_ARCH=${arch}
 
-    export XFREE86_VERSION=4
-
     # Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR
     # - kk 020311
     export PORTSDIR=$(realpath ${pb}/${arch}/${branch}/ports)
@@ -50,6 +57,9 @@ buildenv () {
     export DISTDIR=${pb}/${arch}/${branch}/distfiles
     export PACKAGES=${pb}/${arch}/${branch}/packages
 
+    # Don't pick up host OPTIONS
+    export PORT_DBDIR=/nonexistent
+
     export UNAME_m=${ARCH}
     export UNAME_n=freebsd.org
     export UNAME_p=${ARCH}