diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eeb07d9e..8dcd7fab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -630,11 +630,11 @@ jobs:
           export SOURCE_DATE_EPOCH=1711526400
           ./configure --enable-werror --disable-debug \
             --disable-dependency-tracking
-          ./maketgz 99.98.97
+          ./scripts/maketgz 99.98.97
           # Test reproducibility
           mkdir run1; mv ./libssh2-99.98.97.* run1/
           make clean
-          ./maketgz 99.98.97
+          ./scripts/maketgz 99.98.97
           mkdir run2; cp -p ./libssh2-99.98.97.* run2/
           diff run1 run2
           # Test build from tarball
diff --git a/Makefile.am b/Makefile.am
index 62c4427c..26e660a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,14 +41,15 @@ SCRIPTSFILES = \
   scripts/checksrc-all.pl \
   scripts/checksrc.pl \
   scripts/cmakelint.sh \
+  scripts/git2news.pl \
+  scripts/maketgz \
   scripts/spacecheck.pl \
   scripts/spellcheck.sh \
   scripts/codespell-ignore.words
 
 EXTRA_DIST = $(WIN32FILES) \
-  maketgz RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \
-  CMakeLists.txt cmake git2news.pl libssh2-style.el README.md $(OS400FILES) \
-  $(SCRIPTSFILES)
+  RELEASE-NOTES libssh2.pc.in $(VMSFILES) config.rpath \
+  CMakeLists.txt cmake libssh2-style.el README.md $(OS400FILES) $(SCRIPTSFILES)
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/include/libssh2.h b/include/libssh2.h
index 954dc168..6aa8c9b3 100644
--- a/include/libssh2.h
+++ b/include/libssh2.h
@@ -49,7 +49,7 @@
    banner. Release versions have no appended strings and may of course not
    have dashes either. The release version (without "_DEV") is not stored in
    the source code repo, as the version is properly set in the tarballs by the
-   maketgz script.*/
+   scripts/maketgz script.*/
 #define LIBSSH2_VERSION                             "1.11.2_DEV"
 
 /* The numeric version number is also available "in parts" by using these
@@ -78,7 +78,7 @@
 /*
  * This is the date and time when the full source package was created. The
  * timestamp is not stored in the source code repo, as the timestamp is
- * properly set in the tarballs by the maketgz script.
+ * properly set in the tarballs by the scripts/maketgz script.
  *
  * The format of the date should follow this template:
  *
diff --git a/git2news.pl b/scripts/git2news.pl
similarity index 100%
rename from git2news.pl
rename to scripts/git2news.pl
diff --git a/maketgz b/scripts/maketgz
similarity index 98%
rename from maketgz
rename to scripts/maketgz
index c9d23245..5d88d7c3 100755
--- a/maketgz
+++ b/scripts/maketgz
@@ -101,7 +101,7 @@ fi
 # Generate the changelog
 #
 echo "generate NEWS"
-git log --pretty=fuller --no-color --date=short --decorate=full -1000 | ./git2news.pl > NEWS.dist
+git log --pretty=fuller --no-color --date=short --decorate=full -1000 | "$(dirname "$0")"/git2news.pl > NEWS.dist
 
 ############################################################################
 #