diff --git a/Makefile.tools b/Makefile.tools
index c897f89..d9cb36c 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -2,7 +2,7 @@
 if CLIENT
 bin_PROGRAMS += client/bluetoothctl
 
-client_bluetoothctl_SOURCES = $(gdbus_sources) client/main.c
+client_bluetoothctl_SOURCES = $(gdbus_sources) client/main.c client/display.h
 client_bluetoothctl_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
 endif
 
diff --git a/client/display.h b/client/display.h
new file mode 100644
index 0000000..7abefa4
--- /dev/null
+++ b/client/display.h
@@ -0,0 +1,36 @@
+/*
+ *
+ *  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
+ *
+ */
+
+#define COLOR_OFF	"\x1B[0m"
+#define COLOR_BLUE	"\x1B[0;34m"
+
+static inline void begin_message(void)
+{
+	rl_message("");
+	printf("\r%*c\r", rl_end, ' ');
+}
+
+static inline void end_message(void)
+{
+	rl_clear_message();
+}
diff --git a/client/main.c b/client/main.c
index 0f6e209..221c636 100644
--- a/client/main.c
+++ b/client/main.c
@@ -37,8 +37,7 @@
 #include <glib.h>
 #include <gdbus.h>
 
-#define COLOR_OFF	"\x1B[0m"
-#define COLOR_BLUE	"\x1B[0;34m"
+#include "display.h"
 
 static GMainLoop *main_loop;
 static DBusConnection *dbus_conn;
@@ -46,17 +45,6 @@ static DBusConnection *dbus_conn;
 static GList *ctrl_list;
 static GDBusProxy *default_ctrl;
 
-static inline void begin_message(void)
-{
-	rl_message("");
-	printf("\r%*c\r", rl_end, ' ');
-}
-
-static inline void end_message(void)
-{
-	rl_clear_message();
-}
-
 static void connect_handler(DBusConnection *connection, void *user_data)
 {
 	rl_set_prompt(COLOR_BLUE "[bluetooth]" COLOR_OFF "# ");