diff --git a/tools/tools/README b/tools/tools/README
index 42ea75c4fc3f..253b2e08f739 100644
--- a/tools/tools/README
+++ b/tools/tools/README
@@ -17,6 +17,7 @@ commitsdb	A tool for reconstructing commit history using md5
 		checksums of the commit logs.
 crypto		Test and exercise tools related to the crypto framework
 cxgbetool	A tool for the cxgbe(4) driver.
+cxgbtool	A tool for the cxgb(4) driver.
 diffburst	OBSOLETE: equivalent functionality is available via split -p.
 		For example: "split -p ^diff < patchfile". See split(1).
 editing		Editor modes and the like to help editing FreeBSD code.
diff --git a/usr.sbin/cxgbtool/Makefile b/tools/tools/cxgbtool/Makefile
similarity index 64%
rename from usr.sbin/cxgbtool/Makefile
rename to tools/tools/cxgbtool/Makefile
index f8e5175f8c44..507bee085fc0 100644
--- a/usr.sbin/cxgbtool/Makefile
+++ b/tools/tools/cxgbtool/Makefile
@@ -3,9 +3,8 @@
 PROG=	cxgbtool
 SRCS=	cxgbtool.c
 NO_MAN=
-CFLAGS+= -I${.CURDIR}/../../sys/dev/cxgb -I.
+CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgb -I.
 CFLAGS+= -DCONFIG_T3_REGS -DCHELSIO_INTERNAL
-
-install:
+BINDIR?= /usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/cxgbtool/cxgbtool.c b/tools/tools/cxgbtool/cxgbtool.c
similarity index 100%
rename from usr.sbin/cxgbtool/cxgbtool.c
rename to tools/tools/cxgbtool/cxgbtool.c
diff --git a/usr.sbin/cxgbtool/reg_defs.c b/tools/tools/cxgbtool/reg_defs.c
similarity index 100%
rename from usr.sbin/cxgbtool/reg_defs.c
rename to tools/tools/cxgbtool/reg_defs.c
diff --git a/usr.sbin/cxgbtool/reg_defs_t3.c b/tools/tools/cxgbtool/reg_defs_t3.c
similarity index 100%
rename from usr.sbin/cxgbtool/reg_defs_t3.c
rename to tools/tools/cxgbtool/reg_defs_t3.c
diff --git a/usr.sbin/cxgbtool/reg_defs_t3b.c b/tools/tools/cxgbtool/reg_defs_t3b.c
similarity index 100%
rename from usr.sbin/cxgbtool/reg_defs_t3b.c
rename to tools/tools/cxgbtool/reg_defs_t3b.c
diff --git a/usr.sbin/cxgbtool/reg_defs_t3c.c b/tools/tools/cxgbtool/reg_defs_t3c.c
similarity index 100%
rename from usr.sbin/cxgbtool/reg_defs_t3c.c
rename to tools/tools/cxgbtool/reg_defs_t3c.c
diff --git a/usr.sbin/cxgbtool/version.h b/tools/tools/cxgbtool/version.h
similarity index 100%
rename from usr.sbin/cxgbtool/version.h
rename to tools/tools/cxgbtool/version.h