diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index 2d485bc9d38b..aeac355f4eaa 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -39,6 +39,12 @@ buildenv () {
     	export PKGSUFFIX=.tbz
     	export PKGZIPCMD=bzip2
 	export INDEXFILE=INDEX-6
+	export X_WINDOW_SYSTEM=xorg
+	    ;;
+	x6-exp)
+    	export PKGSUFFIX=.tbz
+    	export PKGZIPCMD=bzip2
+	export INDEXFILE=INDEX-6
 	export X_WINDOW_SYSTEM=xorg
 	    ;;
 	x7)
diff --git a/Tools/portbuild/scripts/dologs b/Tools/portbuild/scripts/dologs
index 341f1a3d595a..e80ad196fc70 100755
--- a/Tools/portbuild/scripts/dologs
+++ b/Tools/portbuild/scripts/dologs
@@ -9,14 +9,14 @@ home=${pb}/errorlogs
 scripts=${pb}/scripts
 
 for ver in latest full; do
-  for num in 4 4-exp 5 5-exp 6 7; do
+  for num in 4 4-exp 5 5-exp 6 6-exp 7; do
     cd $home/$arch-$num-$ver && ${scripts}/processlogs ${arch}
     cd ${pb}/${arch}/${num} && ${scripts}/processfail ${arch} ${num}
   done
-  for num in 4 4-exp 5 5-exp 6 7; do
+  for num in 4 4-exp 5 5-exp 6 6-exp 7; do
     cd $home/$arch-$num-$ver-logs && ${scripts}/processlogs2
   done
-#  for num in 4-exp 5 5-exp 6 7; do
+#  for num in 5 6 6-exp 7; do
 #    cd $home && ${scripts}/comparelogs ${arch} $num-$ver 4-$ver
 #    cd $home && ${scripts}/comparelogs ${arch} 4-$ver $num-$ver
 #  done
diff --git a/Tools/portbuild/scripts/dopackages b/Tools/portbuild/scripts/dopackages
index a426e357afc4..7d4845d2f66c 100755
--- a/Tools/portbuild/scripts/dopackages
+++ b/Tools/portbuild/scripts/dopackages
@@ -251,7 +251,7 @@ fi
 branch=$1
 date=$2
 
-if [ "x$branch" != x4 -a "x$branch" != x4-exp -a "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x7 ]; then
+if [ "x$branch" != x4 -a "x$branch" != x4-exp -a "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != x7 ]; then
   usage
 fi
 
diff --git a/Tools/portbuild/scripts/makeindex b/Tools/portbuild/scripts/makeindex
index 1a9313c3ea31..e497c9b786d1 100755
--- a/Tools/portbuild/scripts/makeindex
+++ b/Tools/portbuild/scripts/makeindex
@@ -46,6 +46,10 @@ case "x$1" in
     branch=6
     INDEXFILE=INDEX-6
     ;;
+  x6-exp)
+    branch=6-exp
+    INDEXFILE=INDEX-6
+    ;;
   x7)
     branch=7
     INDEXFILE=INDEX-7