diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd0f9294b..9a35d58b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -214,7 +214,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}/git-version.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${VERSION}" "config-git.h"
+  COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/scripts/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 446448caf..1d7519f81 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)/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
+	-$(abs_top_srcdir)/scripts/git-version.sh "$(abs_top_srcdir)" "$(VERSION)" config-git.h
 
 SUBDIRS = po doc intl src
 
@@ -35,7 +35,6 @@ EXTRA_DIST = AUTHORS.asciidoc \
              CMakeLists.txt \
              config.rpath \
              config.h.cmake \
-             git-version.sh \
              makedist.sh \
              cmake/CMakeParseArguments.cmake \
              cmake/FindAsciidoc.cmake \
@@ -59,6 +58,7 @@ EXTRA_DIST = AUTHORS.asciidoc \
              cmake/cmake_uninstall.cmake.in \
              po/CMakeLists.txt \
              po/srcfiles.cmake \
+             scripts/git-version.sh \
              weechat.png \
              weechat.pc.in \
              weechat.cygport.in
diff --git a/git-version.sh b/scripts/git-version.sh
similarity index 100%
rename from git-version.sh
rename to scripts/git-version.sh