diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index a371c2df01..c153a6d131 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -202,8 +202,8 @@ rule ArchitectureSetup architecture
 		libraryGrist = $(architecture) ;
 	}
 	local i ;
-	for i in be bnetapi debug device game locale mail media midi midi2
-			network package root screensaver textencoding tracker
+	for i in be bnetapi codec debug device game locale mail media midi
+			midi2 network package root screensaver textencoding tracker
 			translation z {
 		local library = lib$(i).so ;
 		HAIKU_LIBRARY_NAME_MAP_$(architecture)_$(i)
diff --git a/src/add-ons/media/plugins/ape_reader/Jamfile b/src/add-ons/media/plugins/ape_reader/Jamfile
index 886ace5299..8b8a555e8b 100644
--- a/src/add-ons/media/plugins/ape_reader/Jamfile
+++ b/src/add-ons/media/plugins/ape_reader/Jamfile
@@ -14,7 +14,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		Addon [ MultiArchDefaultGristFiles ape_reader ] :
 			APEReader.cpp
 			: [ MultiArchDefaultGristFiles libMonkeysAudio.a MAClib.a ]
-			be libcodec.so media [ TargetLibsupc++ ]
+			be codec media [ TargetLibsupc++ ]
 		;
 	}
 }
diff --git a/src/add-ons/media/plugins/ffmpeg/Jamfile b/src/add-ons/media/plugins/ffmpeg/Jamfile
index f1b15a16f8..0ddcaa0ef0 100644
--- a/src/add-ons/media/plugins/ffmpeg/Jamfile
+++ b/src/add-ons/media/plugins/ffmpeg/Jamfile
@@ -57,7 +57,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 
 			be
 			media
-			libcodec.so
+			codec
 			[ TargetLibsupc++ ]
 		;
 	}
diff --git a/src/add-ons/media/plugins/http_streamer/Jamfile b/src/add-ons/media/plugins/http_streamer/Jamfile
index c8180ce131..3c0ad7f32e 100644
--- a/src/add-ons/media/plugins/http_streamer/Jamfile
+++ b/src/add-ons/media/plugins/http_streamer/Jamfile
@@ -9,7 +9,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		Addon [ MultiArchDefaultGristFiles http_streamer ] :
 			HTTPStreamerPlugin.cpp
 			HTTPMediaIO.cpp
-			: be media bnetapi shared
+			: be codec media bnetapi shared
 			[ TargetLibsupc++ ]
 		;
 	}
diff --git a/src/add-ons/media/plugins/raw_decoder/Jamfile b/src/add-ons/media/plugins/raw_decoder/Jamfile
index c67c61c6c7..2e88804eee 100644
--- a/src/add-ons/media/plugins/raw_decoder/Jamfile
+++ b/src/add-ons/media/plugins/raw_decoder/Jamfile
@@ -10,7 +10,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 		Addon [ MultiArchDefaultGristFiles raw_decoder ] :
 			AudioConversion.cpp
 			RawDecoderPlugin.cpp
-			: be media [ TargetLibsupc++ ]
+			: be codec media [ TargetLibsupc++ ]
 		;
 	}
 }
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
index 9a15c68130..40f3207a68 100644
--- a/src/kits/media/Jamfile
+++ b/src/kits/media/Jamfile
@@ -82,7 +82,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			!missing_symbols.cpp
 			Deprecated.cpp
 			:
-			be libcodec.so localestub shared
+			be codec localestub shared
 			[ TargetLibsupc++ ] [ TargetLibstdc++ ]
 			;
 	}