diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index a066511a1e..e07caa7f4d 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -333,6 +333,7 @@ HOST_KERNEL_WARNING_C++FLAGS = -Wall ;
 switch $(HOST_PLATFORM) {
 	case haiku	: HOST_DEBUG_FLAGS ?= -ggdb ;
 	case linux	: HOST_DEBUG_FLAGS ?= -ggdb ;
+	case freebsd    : HOST_DEBUG_FLAGS ?= -ggdb ;
 	case *		: HOST_DEBUG_FLAGS ?= -g ;
 }
 
@@ -542,6 +543,7 @@ switch $(TARGET_PLATFORM) {
 	case dano		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_DANO ;
 	case haiku		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_HAIKU ;
 	case linux		: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LINUX ;
+	case freebsd            : TARGET_DEFINES        += HAIKU_TARGET_PLATFORM_FREEBSD ;
 	case libbe_test	: TARGET_DEFINES	+= HAIKU_TARGET_PLATFORM_LIBBE_TEST ;
 }
 
@@ -552,6 +554,7 @@ switch $(HOST_PLATFORM) {
 	case dano		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_DANO ;
 	case haiku		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_HAIKU ;
 	case linux		: TARGET_DEFINES	+= HAIKU_HOST_PLATFORM_LINUX ;
+	case freebsd            : TARGET_DEFINES        += HAIKU_TARGET_PLATFORM_FREEBSD ;
 }
 
 
diff --git a/build/scripts/build_cross_tools_gcc4 b/build/scripts/build_cross_tools_gcc4
index 337cd9bfee..c90128a53a 100755
--- a/build/scripts/build_cross_tools_gcc4
+++ b/build/scripts/build_cross_tools_gcc4
@@ -9,6 +9,8 @@ fi
 haikuSourceDir=$1
 buildToolsDir=$2
 
+if [ $(uname) = "FreeBSD" ]; then make="gmake"; else make="make"; fi
+
 if [ $# \< 3 ]; then
 	haikuOutputDir=$haikuSourceDir/generated
 else
@@ -77,8 +79,8 @@ cd $binutilsObjDir
 CFLAGS="-O2" CXXFLAGS="-O2" $binutilsSourceDir/configure \
 	--prefix=$installDir --target=i586-pc-beos --disable-nls \
 	--enable-shared=yes || exit 1
-make || exit 1
-make install || exit 1
+$make || exit 1
+$make install || exit 1
 
 export PATH=$PATH:$installDir/bin
 
@@ -111,13 +113,13 @@ CFLAGS="-O2" CXXFLAGS="-O2" $gccSourceDir/configure --prefix=$installDir \
 	--with-libs=$tmpLibDir || exit 1
 
 # make gcc
-make || {
+$make || {
 	echo "ERROR: Building gcc failed." >&2
 	exit 1
 }
 
 # install gcc
-make install || {
+$make install || {
 	echo "ERROR: Installing the cross compiler failed." >&2
 	exit 1
 }
diff --git a/configure b/configure
index 32fb857ded..13a407fc00 100755
--- a/configure
+++ b/configure
@@ -231,7 +231,7 @@ case "${platform}" in
 			esac
 			;;
 	Linux)	buildPlatform=linux ;;
-	FreeBSD) buildPlatform=linux ;;
+	FreeBSD) buildPlatform=freebsd ;;
 	*)		echo Unsupported platform: ${platform}
 			exit 1 ;;
 esac