diff --git a/Makefile.tools b/Makefile.tools
index a82a3f6..f795a87 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -1,14 +1,15 @@
 
 if TOOLS
 bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
-				tools/hcitool tools/sdptool tools/ciptool
-
-bin_PROGRAMS += tools/hciattach tools/hciconfig
+				tools/hciattach tools/hciconfig \
+				tools/hcitool tools/sdptool tools/ciptool \
+				tools/bccmd
 
 noinst_PROGRAMS += tools/avinfo tools/avtest tools/scotest \
-			tools/hcieventmask tools/hcisecfilter
+			tools/hcieventmask tools/hcisecfilter \
+			tools/btmgmt tools/btattach tools/btsnoop \
+			monitor/btmon emulator/btvirt emulator/b1ee
 
-tools_rfcomm_SOURCES = tools/rfcomm.c
 tools_rfcomm_LDADD = lib/libbluetooth-private.la
 
 tools_l2ping_LDADD = lib/libbluetooth-private.la
@@ -26,12 +27,10 @@ tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
 						tools/hciattach_intel.c
 tools_hciattach_LDADD = lib/libbluetooth-private.la
 
-tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c \
-						src/textfile.h src/textfile.c
+tools_hciconfig_SOURCES = tools/hciconfig.c tools/csr.h tools/csr.c
 tools_hciconfig_LDADD = lib/libbluetooth-private.la
 
-tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c \
-						src/textfile.h src/textfile.c
+tools_hcitool_SOURCES = tools/hcitool.c src/oui.h src/oui.c
 tools_hcitool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 
 tools_sdptool_SOURCES = tools/sdptool.c src/sdp-xml.h src/sdp-xml.c
@@ -47,16 +46,9 @@ tools_scotest_LDADD = lib/libbluetooth-private.la
 
 tools_hcieventmask_LDADD = lib/libbluetooth-private.la
 
-noinst_PROGRAMS += tools/btmgmt tools/btattach tools/btsnoop \
-				monitor/btmon emulator/btvirt emulator/b1ee
-
 tools_btmgmt_SOURCES = tools/btmgmt.c src/glib-helper.c src/eir.c
 tools_btmgmt_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 
-tools_btattach_SOURCES = tools/btattach.c
-
-tools_btsnoop_SOURCES = tools/btsnoop.c
-
 monitor_btmon_SOURCES = monitor/main.c monitor/bt.h \
 					monitor/mainloop.h monitor/mainloop.c \
 					monitor/display.h monitor/display.c \
@@ -98,17 +90,6 @@ tools_obex_server_tool_SOURCES = $(gobex_sources) $(btio_sources) \
 tools_obex_server_tool_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@
 endif
 
-dist_man_MANS += tools/rfcomm.1 tools/l2ping.1 tools/rctest.1 \
-			tools/hciattach.1 tools/hciconfig.1 \
-			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
-else
-EXTRA_DIST += tools/rfcomm.1 tools/l2ping.1 tools/rctest.1 \
-			tools/hciattach.1 tools/hciconfig.1 \
-			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
-endif
-
-bin_PROGRAMS += tools/bccmd
-
 tools_bccmd_SOURCES = tools/bccmd.c tools/csr.h tools/csr.c \
 			tools/csr_hci.c tools/csr_h4.c tools/csr_3wire.c \
 			tools/csr_bcsp.c tools/ubcsp.h tools/ubcsp.c
@@ -119,7 +100,16 @@ tools_bccmd_SOURCES += tools/csr_usb.c
 tools_bccmd_LDADD += @USB_LIBS@
 endif
 
-dist_man_MANS += tools/bccmd.1
+dist_man_MANS += tools/rfcomm.1 tools/l2ping.1 tools/rctest.1 \
+			tools/hciattach.1 tools/hciconfig.1 \
+			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1 \
+			tools/bccmd.1
+else
+EXTRA_DIST += tools/rfcomm.1 tools/l2ping.1 tools/rctest.1  \
+			tools/hciattach.1 tools/hciconfig.1 \
+			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1 \
+			tools/bccmd.1
+endif
 
 if HID2HCI
 udevdir = @UDEV_DIR@