diff --git a/src/basic/generate-af-list.sh b/src/basic/generate-af-list.sh
old mode 100644
new mode 100755
index 3fdfe2ea60..733cf59dd0
--- a/src/basic/generate-af-list.sh
+++ b/src/basic/generate-af-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -eu
 
 $1 -E -dM -include sys/socket.h - </dev/null | \
     grep -Ev 'AF_UNSPEC|AF_MAX' | \
diff --git a/src/basic/generate-arphrd-list.sh b/src/basic/generate-arphrd-list.sh
old mode 100644
new mode 100755
index 9911f315fa..3c2bc5483d
--- a/src/basic/generate-arphrd-list.sh
+++ b/src/basic/generate-arphrd-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 $1 -dM -include net/if_arp.h - </dev/null | \
     awk '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $2; }' | \
diff --git a/src/basic/generate-cap-list.sh b/src/basic/generate-cap-list.sh
old mode 100644
new mode 100755
index b79468cd59..3ac3544539
--- a/src/basic/generate-cap-list.sh
+++ b/src/basic/generate-cap-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 $1 -dM -include linux/capability.h -include "$2" -include "$3" - </dev/null | \
     awk '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $2; }' | \
diff --git a/src/basic/generate-errno-list.sh b/src/basic/generate-errno-list.sh
old mode 100644
new mode 100755
index a80990ac24..a8b4938644
--- a/src/basic/generate-errno-list.sh
+++ b/src/basic/generate-errno-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 $1 -dM -include errno.h - </dev/null | \
     awk '/^#define[ \t]+E[^ _]+[ \t]+/ { print $2; }'
diff --git a/src/boot/efi/no-undefined-symbols.sh b/src/boot/efi/no-undefined-symbols.sh
old mode 100644
new mode 100755
index 4d92082825..14a1a087bb
--- a/src/boot/efi/no-undefined-symbols.sh
+++ b/src/boot/efi/no-undefined-symbols.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 if nm -D -u "$1" | grep ' U '; then
     echo "Undefined symbols detected!"
diff --git a/src/journal/generate-audit_type-list.sh b/src/journal/generate-audit_type-list.sh
old mode 100644
new mode 100755
index edd2b27994..c9476b7809
--- a/src/journal/generate-audit_type-list.sh
+++ b/src/journal/generate-audit_type-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 cpp="$1"
 shift
diff --git a/src/test/generate-sym-test.py b/src/test/generate-sym-test.py
old mode 100755
new mode 100644
diff --git a/src/udev/generate-keyboard-keys-list.sh b/src/udev/generate-keyboard-keys-list.sh
old mode 100644
new mode 100755
index 91635caebc..5fb5ed0bbe
--- a/src/udev/generate-keyboard-keys-list.sh
+++ b/src/udev/generate-keyboard-keys-list.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 $1 -dM -include linux/input.h - </dev/null | \
     awk '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($2 != "KEY_MAX") { print $2 } }'
diff --git a/tools/meson-check-compilation.sh b/tools/meson-check-compilation.sh
old mode 100644
new mode 100755
index 9bbe54669b..e24194247e
--- a/tools/meson-check-compilation.sh
+++ b/tools/meson-check-compilation.sh
@@ -1,3 +1,3 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 "$@" '-' '-c' -o/dev/null </dev/null
diff --git a/tools/meson-check-help.sh b/tools/meson-check-help.sh
index 2f7ba3978d..7102866a5c 100755
--- a/tools/meson-check-help.sh
+++ b/tools/meson-check-help.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 # output width
 if "$1"  --help | grep -v 'default:' | grep -E -q '.{80}.'; then
diff --git a/tools/meson-git-contrib.sh b/tools/meson-git-contrib.sh
old mode 100644
new mode 100755
index c9d3775bcf..ac031638e0
--- a/tools/meson-git-contrib.sh
+++ b/tools/meson-git-contrib.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 git shortlog -s `git describe --abbrev=0`.. | \
     cut -c8- | \
diff --git a/tools/meson-hwdb-update.sh b/tools/meson-hwdb-update.sh
index f97e65c9af..4c919073bb 100755
--- a/tools/meson-hwdb-update.sh
+++ b/tools/meson-hwdb-update.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -ex
+#!/bin/sh -eu
 
 cd "$1"
 
diff --git a/tools/meson-make-symlink.sh b/tools/meson-make-symlink.sh
old mode 100644
new mode 100755
index 87f198694c..69eab9ba73
--- a/tools/meson-make-symlink.sh
+++ b/tools/meson-make-symlink.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 # this is needed mostly because $DESTDIR is provided as a variable,
 # and we need to create the target directory...
diff --git a/units/meson-add-wants.sh b/units/meson-add-wants.sh
old mode 100644
new mode 100755
index ce93d71255..7fbf5ed6fc
--- a/units/meson-add-wants.sh
+++ b/units/meson-add-wants.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -eu
 
 unitdir="$1"
 target="$2"