diff --git a/pkgsrc-newprefix b/pkgsrc-newprefix
index 7292827..29d5b14 100755
--- a/pkgsrc-newprefix
+++ b/pkgsrc-newprefix
@@ -32,6 +32,7 @@
 	LOCALPATCHES	Location of local patches
 	MK_JOBS		Number of MAKE_JOBS (make -j)
 	PKG_PREFIX	Installation prefix of pkgsrc software
+	COMPILER	Which compiler to build (see bootstrap/README*)
 
 Your choice of initial installation list:
 [[$pkgs]]
@@ -126,12 +127,13 @@
   fi
 fi
 export CC=${CC:-`which $cc`}
+bindir=$(dirname `which $CC`) 2>/dev/null
 case $CC in
-  *gcc)		export GCCBASE=${GCCBASE:-$(dirname `which gcc`)}
+  *gcc)		export GCCBASE=${GCCBASE:-$(dirname $bindir)}
 		export CXX=${CXX:-`which g++`} ;;
-  *clang)	export CLANGBASE=${CLANGBASE:-$(dirname `which clang`)}
+  *clang)	export CLANGBASE=${CLANGBASE:-$(dirname $bindir)}
 		export CXX=${CXX:-`which clang++`} ;;
- *icc)		export ICCBASE=${ICCBASE:-$(dirname `which icc`)} ;;
+  *icc)		export ICCBASE=${ICCBASE:-$(dirname $bindir)} ;;
 esac
 
 ##