diff --git a/.gitignore b/.gitignore
index a8ed4d8..ebc6483 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@
 tools/hcisecfilter
 tools/hcitool
 tools/hid2hci
+tools/rfcomm
 tools/l2ping
 tools/ppporc
 tools/sdptool
@@ -75,7 +76,6 @@
 test/ipctest
 test/btiotest
 test/test-textfile
-rfcomm/rfcomm
 compat/dund
 compat/hidd
 compat/pand
diff --git a/Makefile.tools b/Makefile.tools
index aee5af1..70bfb1b 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -1,10 +1,10 @@
 
 if TOOLS
 if CONFIGFILES
-conf_DATA += rfcomm/rfcomm.conf
+conf_DATA += tools/rfcomm.conf
 endif
 
-bin_PROGRAMS += rfcomm/rfcomm tools/l2ping \
+bin_PROGRAMS += tools/rfcomm tools/l2ping \
 				tools/hcitool tools/sdptool tools/ciptool
 
 sbin_PROGRAMS += tools/hciattach tools/hciconfig
@@ -12,11 +12,11 @@
 noinst_PROGRAMS += tools/avinfo tools/ppporc \
 				tools/hcieventmask tools/hcisecfilter
 
-rfcomm_rfcomm_SOURCES = rfcomm/main.c rfcomm/parser.y rfcomm/lexer.l \
-					rfcomm/kword.h rfcomm/kword.c
-EXTRA_rfcomm_rfcomm_SOURCES = rfcomm/parser.h rfcomm/parser.c \
-							rfcomm/lexer.c
-rfcomm_rfcomm_LDADD = lib/libbluetooth.la
+tools_rfcomm_SOURCES = tools/main.c tools/parser.y tools/lexer.l \
+					tools/kword.h tools/kword.c
+EXTRA_tools_rfcomm_SOURCES = tools/parser.h tools/parser.c \
+							tools/lexer.c
+tools_rfcomm_LDADD = lib/libbluetooth.la
 
 tools_l2ping_LDADD = lib/libbluetooth.la
 
@@ -45,18 +45,18 @@
 
 tools_hcieventmask_LDADD = lib/libbluetooth.la
 
-dist_man_MANS += rfcomm/rfcomm.1 tools/l2ping.8 \
+dist_man_MANS += tools/rfcomm.1 tools/l2ping.8 \
 			tools/hciattach.8 tools/hciconfig.8 \
 			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
 else
-EXTRA_DIST += rfcomm/rfcomm.1 tools/l2ping.8 \
+EXTRA_DIST += tools/rfcomm.1 tools/l2ping.8 \
 			tools/hciattach.8 tools/hciconfig.8 \
 			tools/hcitool.1 tools/sdptool.1 tools/ciptool.1
 endif
 
-CLEANFILES += rfcomm/lexer.c rfcomm/parser.c rfcomm/parser.h
+CLEANFILES += tools/lexer.c tools/parser.c tools/parser.h
 
-EXTRA_DIST += rfcomm/rfcomm.conf
+EXTRA_DIST += tools/rfcomm.conf
 
 
 if BCCMD
diff --git a/rfcomm/kword.c b/tools/kword.c
similarity index 100%
rename from rfcomm/kword.c
rename to tools/kword.c
diff --git a/rfcomm/kword.h b/tools/kword.h
similarity index 100%
rename from rfcomm/kword.h
rename to tools/kword.h
diff --git a/rfcomm/lexer.l b/tools/lexer.l
similarity index 100%
rename from rfcomm/lexer.l
rename to tools/lexer.l
diff --git a/rfcomm/main.c b/tools/main.c
similarity index 100%
rename from rfcomm/main.c
rename to tools/main.c
diff --git a/rfcomm/parser.y b/tools/parser.y
similarity index 100%
rename from rfcomm/parser.y
rename to tools/parser.y
diff --git a/rfcomm/rfcomm.1 b/tools/rfcomm.1
similarity index 100%
rename from rfcomm/rfcomm.1
rename to tools/rfcomm.1
diff --git a/rfcomm/rfcomm.conf b/tools/rfcomm.conf
similarity index 100%
rename from rfcomm/rfcomm.conf
rename to tools/rfcomm.conf