diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 92cd50cd..5d4fd29e 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,10 @@
 # enforce that all scripts have a --help and --version option
 AUTOMAKE_OPTIONS = std-options
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = makepkg-wrapper
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = \
+	makepkg-wrapper \
+	pacman-db-upgrade-wrapper \
+	pacman-key-wrapper \
+	pkgdelta-wrapper
 
 SUBDIRS = po
 
@@ -47,11 +51,6 @@ LIBMAKEPKGDIRS = \
 	tidy \
 	util
 
-LIBMAKEPKG = \
-	libmakepkg/util/message.sh \
-	libmakepkg/util/option.sh \
-	libmakepkg/util/util.sh
-
 LIBMAKEPKG_IN = \
 	libmakepkg/integrity.sh \
 	libmakepkg/integrity/generate_checksum.sh \
@@ -96,11 +95,13 @@ LIBMAKEPKG_IN = \
 	libmakepkg/tidy/strip.sh \
 	libmakepkg/tidy/zipman.sh \
 	libmakepkg/util.sh \
+	libmakepkg/util/message.sh \
+	libmakepkg/util/option.sh \
 	libmakepkg/util/pkgbuild.sh \
-	libmakepkg/util/source.sh
+	libmakepkg/util/source.sh \
+	libmakepkg/util/util.sh
 
 LIBMAKEPKG_DIST = \
-	$(LIBMAKEPKG) \
 	$(addsuffix .in, $(LIBMAKEPKG_IN))
 
 COMPLETION_IN = \
diff --git a/scripts/libmakepkg/util/message.sh b/scripts/libmakepkg/util/message.sh.in
similarity index 100%
rename from scripts/libmakepkg/util/message.sh
rename to scripts/libmakepkg/util/message.sh.in
diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh.in
similarity index 100%
rename from scripts/libmakepkg/util/option.sh
rename to scripts/libmakepkg/util/option.sh.in
diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh.in
similarity index 100%
rename from scripts/libmakepkg/util/util.sh
rename to scripts/libmakepkg/util/util.sh.in
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index b532d92a..4792bdfa 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -48,7 +48,7 @@ scripts/libmakepkg/tidy/purge.sh.in
 scripts/libmakepkg/tidy/staticlibs.sh.in
 scripts/libmakepkg/tidy/strip.sh.in
 scripts/libmakepkg/tidy/zipman.sh.in
-scripts/libmakepkg/util/message.sh
+scripts/libmakepkg/util/message.sh.in
 scripts/libmakepkg/util/source.sh.in
 scripts/library/output_format.sh
 scripts/library/parseopts.sh