diff --git a/tools/env.sh b/tools/env.sh
index 7eec281e..d2fc3bdb 100755
--- a/tools/env.sh
+++ b/tools/env.sh
@@ -5,7 +5,7 @@ export LUNA_BASE=${LUNA_BASE:-$LUNA_ROOT/base}
 [ -f "$LUNA_ROOT/env-local.sh" ] && source $LUNA_ROOT/env-local.sh
 
 export LUNA_ARCH=${LUNA_ARCH:-x86_64}
-export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/tools/exec/:$PATH
+export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/toolchain/bin:$LUNA_ROOT/tools/exec/:$PATH
 
 if [ "$USE_MAKE" = "1" ]
 then
diff --git a/tools/setup-autoconf.sh b/tools/setup-autoconf.sh
index e2df178f..c1781f2f 100755
--- a/tools/setup-autoconf.sh
+++ b/tools/setup-autoconf.sh
@@ -35,9 +35,6 @@ unset AR
 
 echo "Building autoconf (precisely version 2.69)..."
 
-../autoconf-$AUTOCONF_VERSION/configure --prefix="/"
+../autoconf-$AUTOCONF_VERSION/configure --prefix=$LUNA_ROOT/toolchain
 make
-DESTDIR=$LUNA_ROOT/toolchain/dist make install
-
-cd $LUNA_ROOT
-mv toolchain/dist/bin/* toolchain/dist
+make install