diff --git a/Makefile.am.in b/Makefile.am.in
index 7b23536f298a84c35069820c7f6ba25d4374811e..36594ad2e8f49f94c2404d8cb3ecf1a101e3d700 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -1,5 +1,5 @@
 ## Process this file with make_am to produce Makefile.am
-CVS_HEADERS: EXTRA_DIST
+CVS_HEADERS: cvs_headers
 BODY:
 
 AUTOMAKE_OPTIONS = foreign
@@ -49,3 +49,5 @@ desQuickCore.c:
 			     LOADCORE,KEYMAPQUICK,SAVECORE)' 
 		@echo >> $@ 'DECRYPT(DesQuickCoreDecrypt,TEMPQUICK,\
 			     LOADCORE,KEYMAPQUICK,SAVECORE)' 
+
+EXTRA_DIST = $(cvs_headers) Makefile.am.in
diff --git a/include/Makefile.am.in b/include/Makefile.am.in
index e75b238424c049966d415e36f85a930da4212df0..ac708a014abb56eac31533164430eb8d554ab934 100644
--- a/include/Makefile.am.in
+++ b/include/Makefile.am.in
@@ -1,3 +1,5 @@
 ## Process this file with make_am to produce Makefile.am
-CVS_HEADERS: EXTRA_DIST
+CVS_HEADERS: cvs_headers
 BODY:
+
+EXTRA_DIST = $(cvs_headers) Makefile.am.in