diff --git a/Makefile.am b/Makefile.am
index abf8b4c1a963c0ae05edcf85de5947bad231b704..0bbfaaf3cee9e3d58f3d10aac018a185b3d29711 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,7 @@ SUBDIRS = \
     include \
     master \
     script \
-    tools
+    tool
 
 DIST_SUBDIRS = \
     devices \
@@ -44,7 +44,7 @@ DIST_SUBDIRS = \
     include \
     master \
     script \
-    tools
+    tool
 
 EXTRA_DIST = \
 	Doxyfile \
diff --git a/configure.ac b/configure.ac
index 7f795644df7310840127c7e351b8857b62ea5162..67126da0df2eb6ff569f8c160c7002f6a1fa4f2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,7 +504,7 @@ AC_CONFIG_FILES([
         script/Makefile
         script/init.d/Makefile
         script/sysconfig/Makefile
-        tools/Makefile
+        tool/Makefile
 ])
 AC_OUTPUT
 
diff --git a/tools/Makefile.am b/tool/Makefile.am
similarity index 100%
rename from tools/Makefile.am
rename to tool/Makefile.am
diff --git a/tools/Master.cpp b/tool/Master.cpp
similarity index 100%
rename from tools/Master.cpp
rename to tool/Master.cpp
diff --git a/tools/Master.h b/tool/Master.h
similarity index 100%
rename from tools/Master.h
rename to tool/Master.h
diff --git a/tools/main.cpp b/tool/main.cpp
similarity index 100%
rename from tools/main.cpp
rename to tool/main.cpp