diff --git a/db/Makefile.am b/db/Makefile.am
index 9a3fbb180..3fee178ab 100644
--- a/db/Makefile.am
+++ b/db/Makefile.am
@@ -1,8 +1,9 @@
 AUTOMAKE_OPTIONS = gnu
 
 EXTRA_DIST = \
-	zmschema.sql.z \
-	zmdrop.sql.z \
+	zmschema.sql.in \
+	zmdrop.sql.in \
+	zm_config.sql \
 	zmalter-0.0.1.sql \
 	zmalter-0.9.7.sql \
 	zmalter-0.9.8.sql \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 310532365..f48a92546 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -21,21 +21,21 @@ SUBDIRS = \
     ZoneMinder
 
 EXTRA_DIST = \
-	zmdc.pl.z \
-	zmaudit.pl.z \
-	zmfilter.pl.z \
-	zmtrigger.pl.z \
-	zmx10.pl.z \
-	zmwatch.pl.z \
-	zmpkg.pl.z \
-	zmupdate.pl.z \
-	zmvideo.pl.z \
-	zmcontrol-pelco-d.pl.z \
-	zmcontrol-pelco-p.pl.z \
-	zmcontrol-visca.pl.z \
-	zmcontrol-kx-hcm10.pl.z \
-	zmcontrol-axis-v2.pl.z \
-	zmtrack.pl.z \
+	zmdc.pl \
+	zmaudit.pl \
+	zmfilter.pl
+	zmtrigger.pl
+	zmx10.pl
+	zmwatch.pl
+	zmpkg.pl
+	zmupdate.pl
+	zmvideo.pl
+	zmcontrol-pelco-d.pl
+	zmcontrol-pelco-p.pl
+	zmcontrol-visca.pl
+	zmcontrol-kx-hcm10.pl
+	zmcontrol-axis-v2.pl
+	zmtrack.pl
 	ZoneMinder/lib/ZoneMinder.pm.in \
 	ZoneMinder/lib/ZoneMinder.pm \
 	ZoneMinder/Makefile.PL \
@@ -44,5 +44,5 @@ EXTRA_DIST = \
 	ZoneMinder/Changes \
 	ZoneMinder/MANIFEST \
 	ZoneMinder/META.yml \
-	zm.z
+	zm.in
 
diff --git a/src/Makefile.am b/src/Makefile.am
index bd7872606..35b2a50b4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,9 @@ noinst_HEADERS = \
 	zm_regexp.h \
 	zm_buffer.h
 
-EXTRA_DIST = zm_config.h.z
+EXTRA_DIST = \
+	zm_config.h.in \
+	zm_config_defines.h
 
 dist-hook:
 	@( rm $(distdir)/zm_config.h )
diff --git a/web/Makefile.am b/web/Makefile.am
index 7e22f9d1a..6c5c9a517 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -112,7 +112,7 @@ EXTRA_DIST = \
 	swap.pl \
 	zm.php \
 	zm_actions.php \
-	zm_config.php.z \
+	zm_config.php.in \
 	zm_control_funcs.php \
 	zm_db.php \
 	zm_export_funcs.php \