diff --git a/Makefile.tools b/Makefile.tools
index fe96914..c11fd86 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -3,7 +3,7 @@ if TOOLS
 bin_PROGRAMS += tools/rfcomm tools/l2ping \
 				tools/hcitool tools/sdptool tools/ciptool
 
-sbin_PROGRAMS += tools/hciattach tools/hciconfig
+bin_PROGRAMS += tools/hciattach tools/hciconfig
 
 noinst_PROGRAMS += tools/avinfo tools/hcieventmask tools/hcisecfilter
 
@@ -89,16 +89,16 @@ 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.8 \
-			tools/hciattach.8 tools/hciconfig.8 \
+dist_man_MANS += tools/rfcomm.1 tools/l2ping.1 \
+			tools/hciattach.1 tools/hciconfig.1 \
 			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
 else
-EXTRA_DIST += tools/rfcomm.1 tools/l2ping.8 \
-			tools/hciattach.8 tools/hciconfig.8 \
+EXTRA_DIST += tools/rfcomm.1 tools/l2ping.1 \
+			tools/hciattach.1 tools/hciconfig.1 \
 			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
 endif
 
-sbin_PROGRAMS += tools/bccmd
+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 \
@@ -110,7 +110,7 @@ tools_bccmd_SOURCES += tools/csr_usb.c
 tools_bccmd_LDADD += @USB_LIBS@
 endif
 
-dist_man_MANS += tools/bccmd.8
+dist_man_MANS += tools/bccmd.1
 
 if HID2HCI
 udevdir = @UDEV_DIR@
@@ -119,9 +119,9 @@ udev_PROGRAMS = tools/hid2hci
 
 tools_hid2hci_LDADD = @USB_LIBS@ @UDEV_LIBS@
 
-dist_man_MANS += tools/hid2hci.8
+dist_man_MANS += tools/hid2hci.1
 else
-EXTRA_DIST += tools/hid2hci.8
+EXTRA_DIST += tools/hid2hci.1
 endif
 
 
@@ -142,9 +142,7 @@ endif
 
 
 if TEST
-sbin_PROGRAMS += test/hciemu
-
-bin_PROGRAMS += test/l2test test/rctest
+bin_PROGRAMS += test/hciemu test/l2test test/rctest
 
 noinst_PROGRAMS += test/gaptest test/sdptest test/scotest test/avtest \
 					test/lmptest test/bdaddr test/agent \
@@ -185,9 +183,9 @@ test_test_textfile_SOURCES = test/test-textfile.c src/textfile.h src/textfile.c
 
 dist_man_MANS += test/rctest.1 test/hciemu.1
 
-EXTRA_DIST += test/bdaddr.8
+EXTRA_DIST += test/bdaddr.1
 else
-EXTRA_DIST += test/rctest.1 test/hciemu.1 test/bdaddr.8
+EXTRA_DIST += test/rctest.1 test/hciemu.1 test/bdaddr.1
 endif
 
 EXTRA_DIST += test/sap_client.py test/bluezutils.py \
diff --git a/test/bdaddr.8 b/test/bdaddr.1
similarity index 98%
rename from test/bdaddr.8
rename to test/bdaddr.1
index 88345f8..efb77d2 100644
--- a/test/bdaddr.8
+++ b/test/bdaddr.1
@@ -1,4 +1,4 @@
-.TH BDADDR 8 "Sep 27 2005" BlueZ "Linux System Administration"
+.TH BDADDR 1 "Sep 27 2005" BlueZ "Linux System Administration"
 .SH NAME
 bdaddr \- Utility for changing the Bluetooth device address
 .SH SYNOPSIS
diff --git a/tools/bccmd.8 b/tools/bccmd.1
similarity index 99%
rename from tools/bccmd.8
rename to tools/bccmd.1
index 28cbe88..26c83a6 100644
--- a/tools/bccmd.8
+++ b/tools/bccmd.1
@@ -1,4 +1,4 @@
-.TH BCCMD 8 "Jun 20 2006" BlueZ "Linux System Administration"
+.TH BCCMD 1 "Jun 20 2006" BlueZ "Linux System Administration"
 .SH NAME
 bccmd \- Utility for the CSR BCCMD interface
 .SH SYNOPSIS
diff --git a/tools/hciattach.8 b/tools/hciattach.1
similarity index 99%
rename from tools/hciattach.8
rename to tools/hciattach.1
index cc97cad..d506034 100644
--- a/tools/hciattach.8
+++ b/tools/hciattach.1
@@ -1,4 +1,4 @@
-.TH HCIATTACH 8 "Jan 22 2002" BlueZ "Linux System Administration"
+.TH HCIATTACH 1 "Jan 22 2002" BlueZ "Linux System Administration"
 .SH NAME
 hciattach \- attach serial devices via UART HCI to BlueZ stack
 .SH SYNOPSIS
diff --git a/tools/hciconfig.8 b/tools/hciconfig.1
similarity index 99%
rename from tools/hciconfig.8
rename to tools/hciconfig.1
index 897d820..633ffa3 100644
--- a/tools/hciconfig.8
+++ b/tools/hciconfig.1
@@ -1,4 +1,4 @@
-.TH HCICONFIG 8 "Nov 11 2002" BlueZ "Linux System Administration"
+.TH HCICONFIG 1 "Nov 11 2002" BlueZ "Linux System Administration"
 .SH NAME
 hciconfig \- configure Bluetooth devices
 .SH SYNOPSIS
diff --git a/tools/hid2hci.8 b/tools/hid2hci.1
similarity index 97%
rename from tools/hid2hci.8
rename to tools/hid2hci.1
index 6ea7ed8..8c5d520 100644
--- a/tools/hid2hci.8
+++ b/tools/hid2hci.1
@@ -14,7 +14,7 @@
 .\"	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 .\"
 .\"
-.TH HID2HCI 8 "MAY 15, 2009" "" ""
+.TH HID2HCI 1 "MAY 15, 2009" "" ""
 
 .SH NAME
 hid2hci \- Bluetooth HID to HCI mode switching utility
diff --git a/tools/l2ping.8 b/tools/l2ping.1
similarity index 98%
rename from tools/l2ping.8
rename to tools/l2ping.1
index 8b77ee2..4d09b05 100644
--- a/tools/l2ping.8
+++ b/tools/l2ping.1
@@ -1,4 +1,4 @@
-.TH L2PING 8 "Jan 22 2002" BlueZ "Linux System Administration"
+.TH L2PING 1 "Jan 22 2002" BlueZ "Linux System Administration"
 .SH NAME
 l2ping \- Send L2CAP echo request and receive answer
 .SH SYNOPSIS