diff --git a/.github/workflows/PyNUTClient.yml b/.github/workflows/PyNUTClient.yml
index bcf501a24e..5e96018bce 100644
--- a/.github/workflows/PyNUTClient.yml
+++ b/.github/workflows/PyNUTClient.yml
@@ -39,12 +39,13 @@ jobs:
       # so we need semicolons between commands!
       run: >-
         set -x ;
+        git --version >&2 || true ;
         TAG_NAME="$(echo $GITHUB_REF | cut -d / -f 3)" ;
         if [ x"$TAG_NAME" = xmaster ]; then
             TAG_NAME="$(git describe --tags --match 'v[0-9]*.[0-9]*.[0-9]' --exclude '*-signed' --exclude '*rc*' --exclude '*alpha*' --exclude '*beta*' 2>/dev/null || git describe --tags --exclude '*rc*' --exclude '*alpha*' --exclude '*beta*' --exclude '*Windows*' --exclude '*IPM*' 2>/dev/null | sed -e 's/^v\([0-9]\)/\1/' -e 's,^.*/,,')" \
             && test -n "${TAG_NAME}" \
             || TAG_NAME="2.8.1-`TZ=UTC date +%s`" ;
-        fi ;
+        fi >&2 ;
         TAG_NAME="$(echo "$TAG_NAME" | sed -e 's/^v//' -e 's/-g.*$//' -e 's/-/./g')" ;
         echo "TAG_NAME=$TAG_NAME" >> $GITHUB_OUTPUT
     - name: Install pypa/setuptools
@@ -55,7 +56,7 @@ jobs:
       run: >-
         set -e ;
         cd scripts/python/module ;
-        touch Makefile ;
+        cp -f Makefile.am Makefile ;
         make -f Makefile.am clean-local dist NUT_SOURCE_GITREV_NUMERIC="${{ steps.tag.outputs.TAG_NAME }}" PYTHON="${{ steps.pythoncmd.outputs.PYTHON }}" top_srcdir="../../.." srcdir="." builddir="." ;
         find . -ls
     - name: Publish master distribution 📦 to Test PyPI