diff --git a/build/jam/BootRules b/build/jam/BootRules
index e66a6f9d0f..63efcc5237 100644
--- a/build/jam/BootRules
+++ b/build/jam/BootRules
@@ -145,5 +145,5 @@ rule BuildMBR binary : source
 actions BuildMBR
 {
 	$(RM) $(1)
-	$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH)) $(2) -o $(1) $(MBRFLAGS) -nostdlib -Xlinker --oformat=binary -Xlinker -S -Xlinker -N -Xlinker "-e start" -Xlinker "-Ttext=0x600"
+	$(HAIKU_CC_$(HAIKU_PACKAGING_ARCH)) $(2) -o $(1) $(MBRFLAGS) -nostdlib -Xlinker --oformat=binary -Xlinker -S -Xlinker -N -Xlinker --entry=start -Xlinker -Ttext=0x600
 }
diff --git a/build/jam/KernelRules b/build/jam/KernelRules
index 7fc8b47762..11fda4f6e0 100644
--- a/build/jam/KernelRules
+++ b/build/jam/KernelRules
@@ -139,7 +139,7 @@ rule KernelAddon
 
 	# compile and link
 	SetupKernel $(sources) : : false ;
-	local linkFlags = -nostdlib -Xlinker --no-undefined
+	local linkFlags = -shared -nostdlib -Xlinker --no-undefined
 		-Xlinker -soname=\"$(target:G=)\" $(TARGET_KERNEL_ADDON_LINKFLAGS) ;
 	LINKFLAGS on $(target) = [ on $(target) return $(LINKFLAGS) ] $(linkFlags) ;
 	Main $(target) : $(sources) ;