diff --git a/Makefile.am b/Makefile.am
index 0741d3b03..55417eb63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,13 @@ EXTRA_DIST = \
 	cf/krb-version.m4 \
 	cf/roken.m4 \
 	cf/valgrind-suppressions \
+	cf/maybe-valgrind.sh \
+	cf/symbol-version.py \
+	cf/w32-check-exported-symbols.pl \
+	cf/w32-def-from-dll.pl \
+	cf/w32-detect-vc-version.pl \
+	cf/w32-hh-toc-from-info.pl \
+	cf/w32-list-externs-from-objs.pl \
 	cf/vararray.m4
 
 print-distdir:
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2a77c9636..c4d5fab92 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -145,6 +145,9 @@ EXTRA_DIST = \
 	layman.asc \
 	doxytmpl.dxy \
 	wind.din \
+	base.hhp \
+	heimdal.hhp \
+	hx509.hhp \
 	vars.tin
 
 CLEANFILES = \
diff --git a/include/Makefile.am b/include/Makefile.am
index 091ee0143..696a023ed 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,7 +13,7 @@ nodist_include_HEADERS = krb5-types.h
 
 noinst_HEADERS = heim_threads.h crypto-headers.h
 
-EXTRA_DIST = NTMakefile krb5-types.cross
+EXTRA_DIST = NTMakefile krb5-types.cross config.h.w32
 
 if !CROSS_COMPILE
 
diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index acfd97477..0e82c8ea6 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -78,6 +78,9 @@ LDADD = \
 
 EXTRA_DIST = NTMakefile $(man_MANS) \
 	heimtools-version.rc \
+	kcpytkt.c \
+	kdeltkt.c \
+	kvno.c \
 	kdestroy-version.rc \
 	kdigest-version.rc \
 	kgetcred-version.rc \
diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index f2e6f1cb4..7c513d5bc 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -242,6 +242,7 @@ test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
 
 EXTRA_DIST =		\
 	NTMakefile	\
+	README.template \
 	asn1_compile-version.rc \
 	libasn1-exports.def \
 	cms.asn1	\
diff --git a/lib/com_err/Makefile.am b/lib/com_err/Makefile.am
index e5b51b06a..7c06cf56f 100644
--- a/lib/com_err/Makefile.am
+++ b/lib/com_err/Makefile.am
@@ -42,6 +42,7 @@ strlcpy.c:
 
 EXTRA_DIST = \
 	NTMakefile \
+	com_err.3 \
 	compile_et-version.rc \
 	libcom_err-version.rc \
 	libcom_err-exports.def \
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index aba59907d..ad88f6bf5 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -341,6 +341,13 @@ EXTRA_DIST = \
 	libgssapi-version.rc \
 	libgssapi-exports.def \
 	$(man_MANS) \
+	gen-oid.pl \
+	gssapi/gssapi_netlogon.h \
+	krb5/test_acquire_cred.c \
+	krb5/test_cred.c \
+	krb5/test_kcred.c \
+	krb5/test_oid.c \
+	oid.txt \
 	krb5/gkrb5_err.et \
 	mech/gssapi.asn1 \
 	spnego/spnego.asn1 \
diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
index e773e663f..b8d65495c 100644
--- a/lib/hcrypto/Makefile.am
+++ b/lib/hcrypto/Makefile.am
@@ -335,9 +335,14 @@ EXTRA_DIST = \
 	DESperate.txt \
 	passwd_dialog.rc \
 	libhcrypto-exports.def \
+	dh-tfm.c \
 	ec.h \
 	ecdh.h \
 	ecdsa.h \
+	evp-crypt.c \
+	evp-w32.c \
+	evp-w32.h \
+	evp-wincng.c \
 	gen-des.pl \
 	md5crypt_test.c \
 	passwd_dialog.aps \
@@ -346,7 +351,9 @@ EXTRA_DIST = \
 	passwd_dialog.res \
 	passwd_dlg.c \
 	passwd_dlg.h \
+	rand-w32.c \
 	resource.h \
+	rsa-tfm.c \
 	rsakey.der \
 	rsakey2048.der \
 	rsakey4096.der \
diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index d1a00bd49..b58deb3e3 100644
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -347,6 +347,12 @@ EXTRA_DIST = \
 	tst-crypto-select5 \
 	tst-crypto-select6 \
 	tst-crypto-select7 \
+	data/PKITS_data.zip \
+	data/eccurve.pem \
+	data/https.crt \
+	data/https.key \
+	data/mkcert.sh \
+	data/nist-result2 \
 	data/n0ll.pem \
 	data/secp256r1TestCA.cert.pem \
 	data/secp256r1TestCA.key.pem \
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index 9431614f9..74d8ae171 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -401,6 +401,9 @@ test_config_strings.out: test_config_strings.cfg
 
 EXTRA_DIST = \
 	NTMakefile \
+	config_reg.c \
+	dll.c \
+	libkrb5-exports.def.in \
 	verify_krb5_conf-version.rc \
 	krb5_err.et \
 	krb_err.et \
diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 1aff6c1e9..a8246b25c 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -245,7 +245,23 @@ EXTRA_DIST = \
 	NTMakefile \
 	roken.awk roken.h.in \
 	$(man_MANS) \
-	test-mem.h \
+	dirent.c \
+	dirent.hin \
+	dirent-test.c \
+	dlfcn.hin \
+	dlfcn_w32.c \
+	getifaddrs_w32.c \
 	ndbm_wrap.c \
 	ndbm_wrap.h \
+	rename.c \
+	simple_exec_w32.c \
+	sleep.c \
+	sockstartup_w32.c \
+	stdbool.hin \
+	stdint.hin \
+	syslogc.c \
+	syslog.hin \
+	test-mem.h \
+	test-mini_inetd.c \
+	win32_alloc.c \
 	version-script.map
diff --git a/lib/vers/Makefile.am b/lib/vers/Makefile.am
index 434401f95..b366227e6 100644
--- a/lib/vers/Makefile.am
+++ b/lib/vers/Makefile.am
@@ -10,4 +10,4 @@ CHECK_LOCAL		= no-check-local
 
 libvers_la_SOURCES      = print_version.c
 
-EXTRA_DIST = NTMakefile $(build_HEADERZ)
+EXTRA_DIST = NTMakefile $(build_HEADERZ) make-print-version.c
diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
index b556bdce5..49be118c1 100644
--- a/tests/kdc/Makefile.am
+++ b/tests/kdc/Makefile.am
@@ -310,6 +310,9 @@ EXTRA_DIST = \
 	check-tester.in \
 	check-uu.in \
 	donotexists.txt \
+	hdb-mitdb \
+	hdb-mitdb.kadm5 \
+	hdb-mitdb.mkey \
 	heimdal.acl \
 	iprop-acl \
 	kdc-tester1.json \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index f2efe9b62..d87dd49db 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -50,6 +50,7 @@ krb5-config: krb5-config.in
 
 EXTRA_DIST = \
 	NTMakefile \
+	cov.sh \
 	$(man_MANS) \
 	krb5-config.in \
 	heimdal-gssapi.pc.in \