diff --git a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile
index 2f4aebdbd8..80dbbc94f6 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/Jamfile
@@ -1,26 +1,14 @@
 SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 ichaudio ;
 
-# UsePrivateHeaders media ;
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) src add-ons media media-add-ons lala ] ;
 
-KernelMergeObject ichaudio_driver.o : 
+
+KernelAddon ichaudio :
 	ichaudio.c
 	io.c
-	:
-	-fno-pic -Wno-unused -D_KERNEL_MODE
-	;
+	: ichaudio_lala.o
+;
 
-KernelLd ichaudio :
-	ichaudio_driver.o
-	lala.o
-	/boot/beos/system/kernel_intel
-	:
-	$(HAIKU_TOP)/src/kernel/ldscripts/$(TARGET_ARCH)/add-on.ld
-	:
-	-Bdynamic -shared
-	:
-	:
-	;
 
 SubInclude HAIKU_TOP src add-ons kernel drivers audio ac97 ichaudio lala ;
diff --git a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile
index d54c6fac1f..6a78fd7ef8 100644
--- a/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile
+++ b/src/add-ons/kernel/drivers/audio/ac97/ichaudio/lala/Jamfile
@@ -1,12 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers audio ac97 ichaudio lala ;
 
-# R5KernelStaticLibrary liblala.a :
-# 	driver.c
-# ;
 
-KernelMergeObject lala.o :
+KernelMergeObject ichaudio_lala.o :
 	driver.c
 	util.c
-	: 
-	-fno-pic -D_KERNEL_MODE
-	;
+;