diff --git a/tools/heimdal-build.sh b/tools/heimdal-build.sh
index dd8f78799..16619148e 100644
--- a/tools/heimdal-build.sh
+++ b/tools/heimdal-build.sh
@@ -67,6 +67,10 @@ do
 		cputimelimit="$2"
 		shift 2
 		;;
+	--ccache-dir)
+		ccachedir="$2"
+		shift 2
+		;;
 	--cvs)
 		hversion="heimdal-cvs-${date}"
 		cvsroot=$2
@@ -200,6 +204,11 @@ if [ X"$autotools" = Xyes ]; then
 	env DATEDVERSION="cvs-${date}" ${hversion}/fix-export ${hversion}
 fi
 
+if [ X"$ccachedir" != X ]; then
+	CCACHE_DIR="${ccachedir}"
+	export CCACHE_DIR
+fi
+
 cd ${hversion} || exit 1
 
 mkdir socket_wrapper_dir