diff --git a/build/scripts/build_cross_tools b/build/scripts/build_cross_tools
index 582be8b8b7..f8bccceea5 100755
--- a/build/scripts/build_cross_tools
+++ b/build/scripts/build_cross_tools
@@ -59,12 +59,12 @@ rm -rf $installDir $objDir
 
 mkdir -p $installDir $objDir $binutilsObjDir $gccObjDir $tmpIncludeDir \
 	$tmpLibDir || exit 1
-mkdir -p $installDir/lib/gcc-lib/i586-pc-beos/$haikuRequiredLegacyGCCVersion
+mkdir -p $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion
 
 # build binutils
 cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/binutils/configure \
-	--prefix=$installDir --target=i586-pc-beos --disable-nls \
+	--prefix=$installDir --target=i586-pc-haiku --disable-nls \
 	--enable-shared=yes --disable-werror || exit 1
 make || exit 1
 make install || exit 1
@@ -95,7 +95,7 @@ copy_headers $haikuSourceDir/headers/posix $tmpIncludeDir/posix
 # configure gcc
 cd $gccObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $buildToolsDir/gcc/configure --prefix=$installDir \
-	--target=i586-pc-beos --disable-nls --enable-shared=yes \
+	--target=i586-pc-haiku --disable-nls --enable-shared=yes \
 	--enable-languages=c,c++ --with-headers=$tmpIncludeDir \
 	--with-libs=$tmpLibDir || exit 1
 
@@ -124,14 +124,14 @@ make install-gcc-cross || {
 # Remove the math.h gcc header. It has been generated by fixincludes
 # (unconditional hack: math_huge_val_ifndef) from ours and it is semantically
 # equivalent.
-rm $installDir/lib/gcc-lib/i586-pc-beos/$haikuRequiredLegacyGCCVersion/include/math.h
+rm $installDir/lib/gcc-lib/i586-pc-haiku/$haikuRequiredLegacyGCCVersion/include/math.h
 
 
 # cleanup
 
 # remove the system headers from the installation dir
 # Only the ones from the source tree should be used.
-sysIncludeDir=$installDir/i586-pc-beos/sys-include
+sysIncludeDir=$installDir/i586-pc-haiku/sys-include
 rm -rf $sysIncludeDir/be $sysIncludeDir/posix
 
 # remove the objects dir
diff --git a/configure b/configure
index d856f1756c..40712f3fbe 100755
--- a/configure
+++ b/configure
@@ -31,7 +31,7 @@ options:
                               Assume cross compilation. <prefix> should be a
                               path to the directory where the cross
                               compilation tools are located, plus the platform
-                              prefix, e.g. "/path/to/tools/i586-pc-beos-".
+                              prefix, e.g. "/path/to/tools/i586-pc-haiku-".
                               This overrides the HAIKU_* tool variables.
   --distro-compatibility <level>
                               The distribution's level of compatibility with
@@ -211,7 +211,7 @@ cd "$currentDir"
 #
 platform=`uname`
 haikuGCCVersion=
-haikuGCCMachine=i586-pc-beos
+haikuGCCMachine=i586-pc-haiku
 haikuStaticLibStdCxx=
 haikuSharedLibStdCxx=
 haikuStaticLibSupCxx=
@@ -232,7 +232,7 @@ buildCrossTools=
 buildCrossToolsScript="$sourceDir/build/scripts/build_cross_tools"
 buildCrossToolsMachine=
 
-export haikuRequiredLegacyGCCVersion="2.95.3-beos-060710"
+export haikuRequiredLegacyGCCVersion="2.95.3-haiku-080323"
 	# version of legacy gcc required to build haiku
 
 set_default_value HAIKU_AR			ar