diff --git a/Tools/portbuild/scripts/buildenv b/Tools/portbuild/scripts/buildenv
index 41b38667b5e6..b9f3b2309bf4 100644
--- a/Tools/portbuild/scripts/buildenv
+++ b/Tools/portbuild/scripts/buildenv
@@ -8,13 +8,10 @@ buildenv () {
 
     case "x$branch" in
 	x4)
-	    export XFREE86_VERSION=4
 	    ;;
 	x4-exp)
-	    export XFREE86_VERSION=4
 	    ;;
 	x5)
-	    export XFREE86_VERSION=4
 	    ;;
 	*)
 	    echo "buildvars: invalid branch"
@@ -22,6 +19,10 @@ buildenv () {
 	    ;;
     esac
 
+    export XFREE86_VERSION=4
+    export PKGSUFFIX=.tbz
+    export PKGZIPCMD=bzip2
+
     # Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR
     # - kk 020311
     export PORTSDIR=$(realpath ${pb}/${branch}/ports)