diff --git a/src/kits/Jamfile b/src/kits/Jamfile
index f6675146aa..03846a1a24 100644
--- a/src/kits/Jamfile
+++ b/src/kits/Jamfile
@@ -30,7 +30,7 @@ File <boot!home!config!lib>/boot/home/config/lib/libopenbeos.so
 
 SubInclude OBOS_TOP src kits app ;
 SubInclude OBOS_TOP src kits interface ;
-#SubInclude OBOS_TOP src kits media ;
+SubInclude OBOS_TOP src kits media ;
 #SubInclude OBOS_TOP src kits midi ;
 #SubInclude OBOS_TOP src kits screensaver ;
 SubInclude OBOS_TOP src kits storage ;
diff --git a/src/kits/media/Jamfile b/src/kits/media/Jamfile
new file mode 100644
index 0000000000..31141eb0f5
--- /dev/null
+++ b/src/kits/media/Jamfile
@@ -0,0 +1,71 @@
+SubDir OBOS_TOP src kits media ;
+
+UsePrivateHeaders media ;
+
+UsePublicHeaders media ;
+
+# That's ugly. The header (ServerInterface.h) should reside in
+# headers/private/media.
+SubDirHdrs [ FDirName $(OBOS_TOP) src servers media ] ;
+
+SharedLibrary media :
+	# Private Media Kit
+	!missing_symbols.cpp
+
+	# Public Media Kit
+	Buffer.cpp
+	BufferConsumer.cpp
+	BufferGroup.cpp
+	BufferProducer.cpp
+	Controllable.cpp
+	FileInterface.cpp
+	MediaAddOn.cpp
+	MediaDecoder.cpp
+	MediaDefs.cpp
+	MediaEncoder.cpp
+	MediaEventLooper.cpp
+	MediaFile.cpp
+	MediaFiles.cpp
+	MediaFormats.cpp
+	MediaNode.cpp
+	MediaRoster.cpp
+	MediaTheme.cpp
+	MediaTrack.cpp
+	ParameterWeb.cpp
+	PlaySound.cpp
+	RealtimeAlloc.cpp
+	Sound.cpp
+	SoundFile.cpp
+	SoundPlayer.cpp
+	TimeCode.cpp
+	TimedEventQueue.cpp
+	TimeSource.cpp
+
+	# Internal Functionality
+	PortPool.cpp
+	DormantNodeManager.cpp
+	SystemTimeSource.cpp
+	BufferIdCache.cpp
+	SharedBufferList.cpp
+	TrackReader.cpp
+	TimedEventQueuePrivate.cpp
+	SoundPlayNode.cpp
+	ChannelMixer.cpp
+	SampleConverter.cpp
+	SamplingrateConverter.cpp
+	VolumeControl.cpp
+
+	# Old (R3) Media Kit
+	OldAudioModule.cpp
+	OldAudioStream.cpp
+	OldBufferStream.cpp
+	OldBufferStreamManager.cpp
+	OldMediaModule.cpp
+	OldSoundFile.cpp
+	OldSubscriber.cpp
+;
+
+LinkSharedOSLibs libmedia.so :
+	be
+;
+