diff --git a/.gitignore b/.gitignore
index 014eddf..3a3e027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,8 +52,8 @@ tools/rctest
 tools/scotest
 tools/sdptool
 tools/avtest
+tools/bdaddr
 test/agent
-test/bdaddr
 test/gaptest
 test/btiotest
 test/mpris-player
diff --git a/Makefile.tools b/Makefile.tools
index f795a87..fedb9a1 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -3,7 +3,7 @@ if TOOLS
 bin_PROGRAMS += tools/rfcomm tools/l2ping tools/l2test tools/rctest \
 				tools/hciattach tools/hciconfig \
 				tools/hcitool tools/sdptool tools/ciptool \
-				tools/bccmd
+				tools/bccmd tools/bdaddr
 
 noinst_PROGRAMS += tools/avinfo tools/avtest tools/scotest \
 			tools/hcieventmask tools/hcisecfilter \
@@ -100,15 +100,18 @@ tools_bccmd_SOURCES += tools/csr_usb.c
 tools_bccmd_LDADD += @USB_LIBS@
 endif
 
+tools_bdaddr_SOURCES = tools/bdaddr.c src/oui.h src/oui.c
+tools_bdaddr_LDADD = lib/libbluetooth-private.la
+
 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
+			tools/bccmd.1 tools/bdaddr.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
+			tools/bccmd.1 tools/bdaddr.1
 endif
 
 if HID2HCI
@@ -141,14 +144,10 @@ endif
 
 
 if TEST
-noinst_PROGRAMS += test/gaptest test/bdaddr test/agent \
-					test/btiotest test/mpris-player
+noinst_PROGRAMS += test/gaptest test/agent test/btiotest test/mpris-player
 
 test_gaptest_LDADD = @DBUS_LIBS@
 
-test_bdaddr_SOURCES = test/bdaddr.c src/oui.h src/oui.c
-test_bdaddr_LDADD = lib/libbluetooth-private.la
-
 test_agent_LDADD = @DBUS_LIBS@
 
 test_btiotest_SOURCES = test/btiotest.c btio/btio.h btio/btio.c
@@ -158,8 +157,6 @@ test_mpris_player_SOURCES = test/mpris-player.c
 test_mpris_player_LDADD = @DBUS_LIBS@ @GLIB_LIBS@
 endif
 
-EXTRA_DIST += test/bdaddr.1
-
 EXTRA_DIST += test/sap_client.py test/bluezutils.py \
 		test/dbusdef.py test/monitor-bluetooth test/list-devices \
 		test/test-discovery test/test-manager test/test-adapter \
diff --git a/test/bdaddr.1 b/tools/bdaddr.1
similarity index 100%
rename from test/bdaddr.1
rename to tools/bdaddr.1
diff --git a/test/bdaddr.c b/tools/bdaddr.c
similarity index 100%
rename from test/bdaddr.c
rename to tools/bdaddr.c