diff --git a/src/Makefile.am b/src/Makefile.am
index 34f245c2e..b53b5dfbe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,6 +22,9 @@ noinst_HEADERS = zm.h zmcfg.h zmdbg.h jinclude.h font_6x11.h
 
 EXTRA_DIST = zmcfg.h.z
 
+dist-hook:
+	@( rm $(distdir)/zmcfg.h )
+
 # Yes, you are correct. This is a HACK!
 install-exec-local:
 	( cd @bindir@; mv zms $(cgidir) )
diff --git a/src/Makefile.in b/src/Makefile.in
index 8ebb3ce30..20485de1d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -268,6 +268,7 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
@@ -393,6 +394,9 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
+dist-hook:
+	@( rm $(distdir)/zmcfg.h )
+
 # Yes, you are correct. This is a HACK!
 install-exec-local:
 	( cd @bindir@; mv zms $(cgidir) )