diff --git a/src/apps/mediaplayer/Jamfile b/src/apps/mediaplayer/Jamfile
new file mode 100644
index 0000000000..d983b92709
--- /dev/null
+++ b/src/apps/mediaplayer/Jamfile
@@ -0,0 +1,13 @@
+SubDir OBOS_TOP src apps mediaplayer ;
+
+UsePrivateHeaders support ;
+
+AddResources MediaPlayer :
+	MediaPlayer.rdef MediaPlayer.icons.rdef MediaPlayer.version.rdef
+	;
+
+App MediaPlayer :
+	MediaPlayerApp.cpp
+	;
+
+LinkSharedOSLibs MediaPlayer : be media tracker ;
diff --git a/src/apps/mediaplayer/MediaPlayer.icons.rdef b/src/apps/mediaplayer/MediaPlayer.icons.rdef
new file mode 100644
index 0000000000..968f9fdd34
--- /dev/null
+++ b/src/apps/mediaplayer/MediaPlayer.icons.rdef
@@ -0,0 +1,166 @@
+/*
+** MediaPlayer.icons.rdef
+**
+*/
+
+resource(0, "BEOS:L:audio") #'ICON' array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFF003F3F0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFF003F3F3F3FFE000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF003F3FFE3FFE3FFE3F0000FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFF003F3F3F3F3F3F3F3F3F3FFE0000FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFF003F3FFE3FFE3FFE3FFE3FFE3FFE3F0000FFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF003F3F3F3F3F3F3F623F3F3F3F3F3F3F3FFE0000FFFFFFFFFFFF"
+	$"FFFFFFFFFF003F3FFE3FFE3FFEB0FE3FFE3FFE3FFE3FFE3FFE3F0000FFFFFFFF"
+	$"FFFFFFFF003F3FFE3FFE3FFEB0FE3F623FFE62FE3FFE3FFE3FFE3FFE0000FFFF"
+	$"FFFFFF003F3FFE3FFE3FFE89FE3F893FFEB0FE3FFE3FFE3FFE3FFE3FFEFE00FF"
+	$"FFFF003F3FFE3FFE3FFEB0FE3FB03FFEB0FE3F623FFE62FE3FFE3FFEFE00FFFF"
+	$"FF003FFEFEFEFEFEFEB0FEFEB0FEFE89FEFE89FEFEB0FEFEFEFEFEFE29B0B0B0"
+	$"0000FEFEFEFEFEFEFEFEFEB0FEFEB0FEFEB0FEFEB0FEFEFEFEFE1F0000B0B0FF"
+	$"FFB00000FEFEFEFEFEFEFEFEFEB0FEFEB0FEFEB0FEFEFEFEFEFE29626200B0FF"
+	$"FFFFB0000000FDFDFDFDFDFDFDFDFDB0FDFD89FDFDFDFDFDFD296262FC0000B0"
+	$"FFFFFFB000890000FDFDFDFDFDFDFDFDFDB0FDFDFDFDFDFD0062622900B0B0B0"
+	$"FFFFFFFFB00089890000FCFCFCFCFCFCFCFCFCFCFCFCFC00620000B0B0FFFFFF"
+	$"FFFFFFFFFFB0006289890000FBFBFBFBFBFBFBFBFBFB000000B0B0FFFFFFFFFF"
+	$"FFFFFFFFFFFFB000626289890000FAFAFAFAFAFAFA0000B0B0FFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFB000FC626289890000FAFAFAFA00B0B0FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFB000FCFC626289890000FA00B0B0FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFB000FCFCFCFC0000B000B0B0FFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFB000FC0000B0B0B0B0B0FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFB000B0B0FFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+};
+
+resource(1, "BEOS:L:video") #'ICON' array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFF003F3F0000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFF003F3F3F3FFE000000FFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF003F3FFE3FFE3FFE3F0000FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFF003F3F3F3F3F3F3F3F3F3FFE0000FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFF003F3FFE3FFE3FFE3FFE3FFE3FFE3F0000FFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF003F3F3F3F3F3F3F623F3F3F3F3F3F3F3FFE0000FFFFFFFFFFFF"
+	$"FFFFFFFFFF003F3FFE3FFE3FFEB0FE3FFE3FFE3FFE3FFE3FFE3F0000FFFFFFFF"
+	$"FFFFFFFF003F3FFE3FFE3FFEB0FE3F623FFE62FE3FFE3FFE3FFE3FFE0000FFFF"
+	$"FFFFFF003F3FFE3FFE3FFE89FE3F893FFEB0FE3FFE3FFE3FFE3FFE3FFEFE00FF"
+	$"FFFF003F3FFE3FFE3FFEB0FE3FB03FFEB0FE3F623FFE62FE3FFE3FFEFE00FFFF"
+	$"FF003FFEFEFEFEFEFEB0FEFEB0FEFE89FEFE89FEFEB0FEFEFEFEFEFE29B0B0B0"
+	$"0000FEFEFEFEFEFEFEFEFEB0FEFEB0FEFEB0FEFEB0FEFEFEFEFE1F0000B0B0FF"
+	$"FFB00000FEFEFEFEFEFEFEFEFEB0FEFEB0FEFEB0FEFEFEFEFEFE29626200B0FF"
+	$"FFFFB0000000FDFDFDFDFDFDFDFDFDB0FDFD89FDFDFDFDFDFD296262FC0000B0"
+	$"FFFFFFB000890000FDFDFDFDFDFDFDFDFDB0FDFDFDFDFDFD0062622900B0B0B0"
+	$"FFFFFFFFB00089890000FCFCFCFCFCFCFCFCFCFCFCFCFC00620000B0B0FFFFFF"
+	$"FFFFFFFFFFB0006289890000FBFBFBFBFBFBFBFBFBFB000000B0B0FFFFFFFFFF"
+	$"FFFFFFFFFFFFB000626289890000FAFAFAFAFAFAFA0000B0B0FFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFB000FC626289890000FAFAFAFA00B0B0FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFB000FCFC626289890000FA00B0B0FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFB000FCFCFCFC0000B000B0B0FFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFB000FC0000B0B0B0B0B0FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFB000B0B0FFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+};
+
+resource large_icon array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000FFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B3F5A00FF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005A0B3F5A5A00"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000B5A0B3F5A5A00"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005C0B5A3F085A5A00"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005CFD0A3FA3A3080900"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF005CFD113F08A3A3CA00FF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFF0000FFFFFFFFFFFF005CFD113FFA08090800FFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFF003F3F0000FFFFFF005CFD113FFA085C5C00FFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFF003F3F3F3FFE0000005CFD113FFA085C5C00FFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFF003F3FFE3FFE3FFE0A5CFD113FFA085C5C00FFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFF003F3F3F3F3F3F3F0A5CFD113FFA085C5C00FFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFF003F3FFE3FFE3FFE0A5CFD113FFA085C5C00FFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF003F3F3F3F3F3F3F620AFD113FFA085C5C000000FFFFFFFFFFFF"
+	$"FFFFFFFFFF003F3FFE3FFE3FFEB00A0B0A3FFA085C5C003FFE3F0000FFFFFFFF"
+	$"FFFFFFFF003F3FFE3FFE3FFEB0FE0A3F0AFA085C5C003FFE3FFE3FFE0000FFFF"
+	$"FFFFFF003F3FFE3FFE3FFE89FE3F0A3F0A000000003FFE3FFE3FFE3FFEFE00FF"
+	$"FFFF003F3FFE3FFE3FFEB0FE3F0A3F5A5B5B5B003FFE62FE3FFE3FFEFE00FFFF"
+	$"FF003FFEFEFEFEFEFEB0FE3FB00A095B5B0000FEFEB0FEFEFEFEFEFE00B0B0FF"
+	$"0000FEFEFEFEFEFEFEFEFEB0FE0A090000B06262B08989898989890100B0B0B0"
+	$"FFB00000FEFEFEFEFEFEFEFE0A0000B000B0B000B0B0B0B0B0B000B0B000B0B0"
+	$"FFFFB0000000FDFDFDFDFDFD0000B000B0B000B0B0B0B0B0B000B0B0B00000B0"
+	$"FFFFFFB000890000FDFDFDFDFDFDFDFDFDB0FDFDFDFDFDFD0062622900B0B0FF"
+	$"FFFFFFFFB00089890000FCFCFCFCFCFCFCFCFCFCFCFCFC00620000B0B0FFFFFF"
+	$"FFFFFFFFFFB0006289890000FBFBFBFBFBFBFBFBFBFB000000B0B0FFFFFFFFFF"
+	$"FFFFFFFFFFFFB000626289890000FAFAFAFAFAFAFA0000B0B0FFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFB000FC626289890000FAFAFAFA00B0B0FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFB000FCFC626289890000FA00B0B0FFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFB000FCFCFCFC0000B000B0B0FFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFB000FC0000B0B0B0B0B0FFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFB000B0B0FFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFB0FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+};
+
+resource(0, "BEOS:M:audio") #'MICN' array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFF003F0000FFFFFFFFFFFFFF"
+	$"FFFFFFFF003FFEFEFE0000FFFFFFFFFF"
+	$"FFFFFF003FFEFE62FEFEFE0000FFFFFF"
+	$"FFFF00FEFEFEB0626262FEFEFE0000FF"
+	$"FF00FEFEFEB0B089B0626289FEFE0000"
+	$"00FEFEFDFEFEB0B0B089B0FEFE0000B0"
+	$"B00000FDFDFDFDFDB0B0FDFD29890000"
+	$"FFB0000000FDFCFCFCFCFC008900B0B0"
+	$"FFFFB000890000FAFAFA000000B0FFFF"
+	$"FFFFFFB000628900FA00B0B0FFFFFFFF"
+	$"FFFFFFFFB000000000B0B0FFFFFFFFFF"
+	$"FFFFFFFFFFB000B0FFB0FFFFFFFFFFFF"
+};
+
+resource(1, "BEOS:M:video") #'MICN' array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF"
+	$"FFFFFFFFFF003F0000FFFFFFFFFFFFFF"
+	$"FFFFFFFF003FFEFEFE0000FFFFFFFFFF"
+	$"FFFFFF003FFEFE62FEFEFE0000FFFFFF"
+	$"FFFF00FEFEFEB0626262FEFEFE0000FF"
+	$"FF00FEFEFEB0B089B0626289FEFE0000"
+	$"00FEFEFDFEFEB0B0B089B0FEFE0000B0"
+	$"B00000FDFDFDFDFDB0B0FDFD29890000"
+	$"FFB0000000FDFCFCFCFCFC008900B0B0"
+	$"FFFFB000890000FAFAFA000000B0FFFF"
+	$"FFFFFFB000628900FA00B0B0FFFFFFFF"
+	$"FFFFFFFFB000000000B0B0FFFFFFFFFF"
+	$"FFFFFFFFFFB000B0FFB0FFFFFFFFFFFF"
+};
+
+resource mini_icon array {
+	$"FFFFFFFFFFFFFFFFFFFFFFFF000000FF"
+	$"FFFFFFFFFFFFFFFFFFFFFF000B3F5A00"
+	$"FFFFFFFFFFFFFFFFFFFF00095A0A5A01"
+	$"FFFFFFFFFFFF00FFFF005B09A3A30000"
+	$"FFFFFFFFFF003F00005BFDFA08A300FF"
+	$"FFFFFFFF003FFE0A0BFDFA5B5B00FFFF"
+	$"FFFFFF003FFEFE0A0BFA5B5B00FFFFFF"
+	$"FFFF00FEFEFE0A5B0B0B0A00FE0000FF"
+	$"FF00FEFEFEFE0A5B5B0000FEFEFE0000"
+	$"00FEFEFDFE0A290000898989890100B0"
+	$"B00000FDFD0000B0B0B0B0B000890000"
+	$"FFB0000000FDFCFCFCFCFC008900B0B0"
+	$"FFFFB000890000FAFAFA000000B0FFFF"
+	$"FFFFFFB000628900FA00B0B0FFFFFFFF"
+	$"FFFFFFFFB000000000B0B0FFFFFFFFFF"
+	$"FFFFFFFFFFB000B0FFB0FFFFFFFFFFFF"
+};
diff --git a/src/apps/mediaplayer/MediaPlayer.rdef b/src/apps/mediaplayer/MediaPlayer.rdef
new file mode 100644
index 0000000000..f0228556e8
--- /dev/null
+++ b/src/apps/mediaplayer/MediaPlayer.rdef
@@ -0,0 +1,47 @@
+/*
+** MediaPlayer.rdef
+**
+*/
+
+/* BEOS:APP_SIG :
+   application:/x-vnd.obos.app-name
+   */
+
+resource app_signature "application/x-vnd.obos.media-player";
+
+/* BEOS:APP_FLAGS :
+   00000000 = 							   SINGLE LAUNCH
+   00000001 = 							   MULTIPLE LAUNCH
+   00000002 = 							   EXCLUSIVE LAUNCH
+   00000004 = 			  BACKGROUND APP + SINGLE LAUNCH
+   00000005 = 			  BACKGROUND APP + MULTIPLE LAUNCH
+   00000006 = 			  BACKGROUND APP + EXCLUSIVE LAUNCH
+   00000008 = ARGV_ONLY + 				   SINGLE LAUNCH
+   00000009 = ARGV_ONLY + 				   MULTIPLE LAUNCH
+   0000000A = ARGV_ONLY + 				   EXCLUSIVE LAUNCH
+   0000000C = ARGV_ONLY + BACKGROUND APP + SINGLE LAUNCH
+   0000000D = ARGV_ONLY + BACKGROUND APP + MULTIPLE LAUNCH
+   0000000E = ARGV_ONLY + BACKGROUND APP + EXCLUSIVE LAUNCH
+   */
+
+resource app_flags B_SINGLE_LAUNCH;
+
+/* BEOS:FILE_TYPES :
+   "types" = "text/plain",
+   "types" = ....   
+   */
+
+resource file_types message {
+	"types" = "audio",
+	"types" = "audio/aiff",
+	"types" = "audio/riff",
+	"types" = "audio/wav",
+	"types" = "audio/x-aiff",
+	"types" = "audio/x-mpeg",
+	"types" = "audio/x-riff",
+	"types" = "audio/x-wav",
+	"types" = "video",
+	"types" = "video/mpeg",
+	"types" = "video/quicktime",
+	"types" = "video/x-msvideo"
+};
diff --git a/src/apps/mediaplayer/MediaPlayer.version.rdef b/src/apps/mediaplayer/MediaPlayer.version.rdef
new file mode 100644
index 0000000000..6a127a2495
--- /dev/null
+++ b/src/apps/mediaplayer/MediaPlayer.version.rdef
@@ -0,0 +1,28 @@
+/*
+** MediaPlayer.version.rdef
+**
+*/
+
+/*
+	BEOS:APP_VERSION resources have a specific format, see also
+	<be/storage/AppFileInfo.h:26>
+
+	But thanks to the rc resource compiler, you don't have to worry
+	about any of that ;-)
+*/            
+
+resource app_version {
+
+	major  = 1, 
+	middle = 0,
+	minor  = 0,
+	
+	/* 0 = development	1 = alpha			2 = beta
+	   3 = gamma		4 = golden master	5 = final */
+	variety = 0,
+	
+	internal = 1,
+	
+	short_info = "R1.0.0d1",
+	long_info = "OpenBeOS 1.0.0d1 ©2003 OpenBeOS Project"
+};