diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 513b5fa5ee..f56ff9b635 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -376,8 +376,8 @@ rule KernelArchitectureSetup architecture
 		case m68k :
 			# We don't want to have to handle emulating missing FPU opcodes for
 			# 040 and 060 in the kernel.
-			HAIKU_KERNEL_CCFLAGS += -m68020-60 ;
-			HAIKU_KERNEL_C++FLAGS += -m68020-60 ;
+			HAIKU_KERNEL_CCFLAGS += -mtune=68020-60 ;
+			HAIKU_KERNEL_C++FLAGS += -mtune=68020-60 ;
 
 		case x86 :
 			HAIKU_KERNEL_CCFLAGS += -march=pentium ;
diff --git a/src/system/kernel/arch/m68k/Jamfile b/src/system/kernel/arch/m68k/Jamfile
index 80fd95af45..83768add32 100644
--- a/src/system/kernel/arch/m68k/Jamfile
+++ b/src/system/kernel/arch/m68k/Jamfile
@@ -20,7 +20,7 @@ KernelMergeObject arch_m68k_030.o :
 	#M68KPagingStructures030.cpp
 	#M68KVMTranslationMap030.cpp
 
-	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -m68030
+	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -mcpu=68030
 ;
 
 KernelMergeObject arch_m68k_040.o :
@@ -33,12 +33,13 @@ KernelMergeObject arch_m68k_040.o :
 	M68KPagingStructures040.cpp
 	M68KVMTranslationMap040.cpp
 
-	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -m68040
+	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -mcpu=68040 -Wa,-m68040
 ;
 
+
 KernelMergeObject arch_m68k_060.o :
 	arch_060.cpp
-	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -m68060
+	: $(TARGET_KERNEL_PIC_CCFLAGS) -Wno-unused -mcpu=68060
 ;
 
 KernelMergeObject kernel_arch_m68k.o :