diff --git a/tools/heimdal-build.sh b/tools/heimdal-build.sh
index 90fc23fb0..55703a0c8 100644
--- a/tools/heimdal-build.sh
+++ b/tools/heimdal-build.sh
@@ -205,8 +205,8 @@ if [ X"$unpack" = Xyes ]; then
 fi
 
 if [ X"$autotools" = Xyes ]; then
-	echo "Autotooling (via fix-export)"
-	env DATEDVERSION="svn${branch}-${date}" ${hversion}/fix-export ${hversion}
+	echo "Autotooling"
+	(cd ${hversion} && sh ./autogen.sh) || exit 1
 fi
 
 if [ X"$ccachedir" != X ]; then