5 files changed, 11 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml
index c72e118f9..c5078d386 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ before_script:
     - sudo pip install msgcheck pylint
 
 script:
-    - ./build-scripts/build.sh
+    - ./tools/build.sh
     - msgcheck po/*.po
     - pylint doc/docgen.py
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8704a195..3b9738a49 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,7 +222,7 @@ configure_file(config.h.cmake config.h @ONLY)
 
 # set the git version in "config-git.h"
 add_custom_target(version_git ALL
-  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/build-scripts/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/tools/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
 
 configure_file(
diff --git a/Makefile.am b/Makefile.am
index ea6451093..634ea97cb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@
 # (if needed, and only for a devel/rc version).
 BUILT_SOURCES = build-config-git.h
 build-config-git.h:
-	-$(abs_top_srcdir)/build-scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
+	-$(abs_top_srcdir)/tools/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
 
 if TESTS
 tests_dir = tests
@@ -64,8 +64,8 @@ EXTRA_DIST = AUTHORS.asciidoc \
              cmake/cmake_uninstall.cmake.in \
              po/CMakeLists.txt \
              po/srcfiles.cmake \
-             build-scripts/build.sh \
-             build-scripts/git-version.sh \
+             tools/build.sh \
+             tools/git-version.sh \
              weechat.png \
              weechat.pc.in \
              weechat.cygport.in
diff --git a/build-scripts/build.sh b/tools/build.sh
index 7a605adaf..9c8f8db58 100755
--- a/build-scripts/build.sh
+++ b/tools/build.sh
@@ -25,12 +25,14 @@
 # configure commands.
 #
 # Syntax to run the script with environment variables:
-#   BUILDTOOL=cmake|autotools ./build.sh
-#   BUILDTOOL=cmake|autotools BUILDARGS="arguments" ./build.sh
+#   BUILDTOOL=cmake ./build.sh
+#   BUILDTOOL=autotools ./build.sh
+#   BUILDTOOL=cmake BUILDARGS="arguments" ./build.sh
+#   BUILDTOOL=autotools BUILDARGS="arguments" ./build.sh
 #
 # Syntax to run the script with arguments on command line:
-#   ./build.sh cmake|autotools
-#   ./build.sh cmake|autotools arguments
+#   ./build.sh cmake [arguments]
+#   ./build.sh autotools [arguments]
 #
 # This script is used to build WeeChat in Travis CI environment.
 #
diff --git a/build-scripts/git-version.sh b/tools/git-version.sh
index c1a8fada3..c1a8fada3 100755
--- a/build-scripts/git-version.sh
+++ b/tools/git-version.sh