diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 191a5f007d..5cee80c1a2 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -139,6 +139,7 @@ switch $(HAIKU_GCC_MACHINE) {
 	case i586-*		: HAIKU_CPU = x86 ;
 	case i686-*		: HAIKU_CPU = x86 ;
 	case powerpc-*	: HAIKU_CPU = ppc ;
+	case m68k-*	: HAIKU_CPU = m68k ;
 	case * : Exit "Unsupported gcc target machine:" $(HAIKU_GCC_MACHINE) ;
 }
 
@@ -153,6 +154,11 @@ switch $(HAIKU_CPU) {
 		HAIKU_DEFINES += __INTEL__ ;
 		HAIKU_BOOT_PLATFORM = bios_ia32 ;
 	}
+	case m68k :
+	{
+		HAIKU_DEFINES += __M68K__ ;
+		HAIKU_BOOT_PLATFORM = atari ;
+	}
 	case * :
 		Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ;
 }
@@ -537,6 +543,8 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
 		HOST_DEFINES += __INTEL__ ;
 	} else if $(HOST_CPU) = ppc {
 		HOST_DEFINES += __POWERPC__ ;
+	} else if $(HOST_CPU) = m68k {
+		HOST_DEFINES += __M68K__ ;
 	}
 
 	# Supposing this is a glibc platform, let's try to get features like large
diff --git a/configure b/configure
index 5e2d05e328..7b5c02f96a 100755
--- a/configure
+++ b/configure
@@ -254,6 +254,7 @@ while [ $# -gt 0 ] ; do
 						case "$2" in
 							x86)	haikuGCCMachine=i586-pc-haiku;;
 							ppc)	haikuGCCMachine=powerpc-apple-haiku;;
+							m68k)	haikuGCCMachine=m68k-unknown-haiku;;
 							*)		echo "Unsupported target architecture: $2"
 									exit 1;;
 						esac