diff --git a/Makefile.tools b/Makefile.tools
index 143a0ee..2350cc9 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -5,6 +5,32 @@ client_bluetoothctl_SOURCES = $(gdbus_sources) client/main.c
 client_bluetoothctl_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -lreadline
 endif
 
+if MONITOR
+bin_PROGRAMS += monitor/btmon
+
+noinst_PROGRAMS += monitor/btmon emulator/btvirt emulator/b1ee
+
+monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
+					monitor/mainloop.h monitor/mainloop.c \
+					monitor/display.h monitor/display.c \
+					monitor/hcidump.h monitor/hcidump.c \
+					monitor/btsnoop.h monitor/btsnoop.c \
+					monitor/control.h monitor/control.c \
+					monitor/packet.h monitor/packet.c \
+					monitor/l2cap.h monitor/l2cap.c \
+					monitor/uuid.h monitor/uuid.c \
+					monitor/sdp.h monitor/sdp.c
+monitor_btmon_LDADD = lib/libbluetooth-private.la
+
+emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
+					monitor/mainloop.h monitor/mainloop.c \
+					emulator/server.h emulator/server.c \
+					emulator/vhci.h emulator/vhci.c \
+					emulator/btdev.h emulator/btdev.c
+
+emulator_b1ee_SOURCES = emulator/b1ee.c monitor/mainloop.h monitor/mainloop.c
+endif
+
 if TOOLS
 bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
 				tools/hciattach tools/hciconfig \
@@ -14,7 +40,6 @@ bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
 noinst_PROGRAMS += tools/avinfo tools/avtest tools/scotest \
 			tools/hcieventmask tools/hcisecfilter \
 			tools/btmgmt tools/btattach tools/btsnoop \
-			monitor/btmon emulator/btvirt emulator/b1ee \
 			tools/btiotest tools/mpris-player
 
 tools_rfcomm_LDADD = lib/libbluetooth-private.la
@@ -56,26 +81,6 @@ tools_hcieventmask_LDADD = lib/libbluetooth-private.la
 tools_btmgmt_SOURCES = tools/btmgmt.c src/glib-helper.c src/eir.c
 tools_btmgmt_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 
-monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
-					monitor/mainloop.h monitor/mainloop.c \
-					monitor/display.h monitor/display.c \
-					monitor/hcidump.h monitor/hcidump.c \
-					monitor/btsnoop.h monitor/btsnoop.c \
-					monitor/control.h monitor/control.c \
-					monitor/packet.h monitor/packet.c \
-					monitor/l2cap.h monitor/l2cap.c \
-					monitor/uuid.h monitor/uuid.c \
-					monitor/sdp.h monitor/sdp.c
-monitor_btmon_LDADD = lib/libbluetooth-private.la
-
-emulator_btvirt_SOURCES = emulator/main.c monitor/bt.h \
-					monitor/mainloop.h monitor/mainloop.c \
-					emulator/server.h emulator/server.c \
-					emulator/vhci.h emulator/vhci.c \
-					emulator/btdev.h emulator/btdev.c
-
-emulator_b1ee_SOURCES = emulator/b1ee.c monitor/mainloop.h monitor/mainloop.c
-
 if READLINE
 bin_PROGRAMS += attrib/gatttool
 attrib_gatttool_SOURCES = attrib/gatttool.c attrib/att.c attrib/gatt.c \
diff --git a/configure.ac b/configure.ac
index e8a389d..6e13eb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,10 @@ AC_ARG_ENABLE(tools, AC_HELP_STRING([--disable-tools],
 		[disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
+AC_ARG_ENABLE(monitor, AC_HELP_STRING([--disable-monitor],
+		[disable Bluetooth monitor]), [enable_monitor=${enableval}])
+AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")
+
 AC_ARG_ENABLE(usb, AC_HELP_STRING([--disable-usb],
 			[disable USB support]), [enable_usb=${enableval}])
 if (test "${enable_tools}" != "no" && test "${enable_usb}" != "no"  ); then