diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index dec8303c6e..01a3166c41 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -110,6 +110,7 @@ SYSTEM_ADD_ONS_MEDIA_PLUGINS = $(GPL_ONLY)ac3_decoder
 	mp3_decoder mp3_reader
 	mp4_reader musepack
 	ogg raw_decoder speex
+	$(X86_ONLY)APE_reader
 	# theora
 	vorbis wav_reader
 ;
diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 3f61d128a4..05453212d0 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -174,7 +174,7 @@ rule AssembleNasm
 
 actions AssembleNasm
 {
-	nasm -d $(ASFLAGS) -f elf -o $(1) $(2)
+	yasm -d $(ASFLAGS) -f elf -o $(1) $(2)
 }
 
 rule Ld