diff --git a/Makefile.tools b/Makefile.tools
index acd403e..8f245e0 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -164,7 +164,8 @@ if EXPERIMENTAL
 noinst_PROGRAMS += tools/bdaddr tools/avinfo tools/avtest tools/scotest \
 			tools/hcieventmask tools/hcisecfilter tools/hwdb \
 			tools/btmgmt tools/btattach tools/btsnoop \
-			tools/btiotest tools/mpris-player
+			tools/btiotest tools/mpris-player \
+			tools/bluetooth-player
 
 tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
 tools_bdaddr_LDADD = lib/libbluetooth-private.la @UDEV_LIBS@
@@ -190,6 +191,10 @@ tools_btiotest_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 tools_mpris_player_SOURCES = $(gdbus_sources) tools/mpris-player.c
 tools_mpris_player_LDADD = @GLIB_LIBS@ @DBUS_LIBS@
 
+tools_bluetooth_player_SOURCES = $(gdbus_sources) tools/bluetooth-player.c \
+				client/display.h client/display.c
+tools_bluetooth_player_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
+
 EXTRA_DIST += tools/bdaddr.1
 endif
 
diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c
new file mode 100644
index 0000000..b38861a
--- /dev/null
+++ b/tools/bluetooth-player.c
@@ -0,0 +1,31 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2012  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+int main(int argc, char *argv[])
+{
+	return 0;
+}