diff --git a/Makefile.am b/Makefile.am
index 7733c5c2e..250809631 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,8 @@ endif
 ACLOCAL_AMFLAGS = -I cf
 
 EXTRA_DIST = \
+	NTMakefile \
+	windows \
 	TODO \
 	LICENSE \
 	README \
diff --git a/admin/Makefile.am b/admin/Makefile.am
index 895516654..bff04c45d 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -40,4 +40,4 @@ LDADD = \
 	$(LIB_readline) \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS) ktutil-commands.in
+EXTRA_DIST = NTMakefile $(man_MANS) ktutil-commands.in
diff --git a/appl/Makefile.am b/appl/Makefile.am
index 2409b9549..5e4e320bc 100644
--- a/appl/Makefile.am
+++ b/appl/Makefile.am
@@ -25,3 +25,5 @@ SUBDIRS = 					\
 	  kx					\
 	  kf					\
 	  $(dir_dce)
+
+EXTRA_DIST = NTMakefile
\ No newline at end of file
diff --git a/appl/afsutil/Makefile.am b/appl/afsutil/Makefile.am
index 6650ed47d..c0ca0d50d 100644
--- a/appl/afsutil/Makefile.am
+++ b/appl/afsutil/Makefile.am
@@ -19,4 +19,4 @@ LDADD = $(LIB_kafs) \
 	$(LIB_hcrypto) \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/dceutils/Makefile.am b/appl/dceutils/Makefile.am
index 0c3a3d3ce..6fa9d1a10 100644
--- a/appl/dceutils/Makefile.am
+++ b/appl/dceutils/Makefile.am
@@ -24,6 +24,7 @@ k5dcecon_SOURCES  = k5dcecon.c k5dce.h
 dpagaix_SOURCES = dpagaix.c
 
 EXTRA_DIST = \
+	NTMakefile \
 	dfspag.exp \
 	README.dcedfs \
 	README.original \
diff --git a/appl/ftp/Makefile.am b/appl/ftp/Makefile.am
index 07f260bfb..efea85d0e 100644
--- a/appl/ftp/Makefile.am
+++ b/appl/ftp/Makefile.am
@@ -3,3 +3,5 @@
 include $(top_srcdir)/Makefile.am.common
 
 SUBDIRS = common ftp ftpd
+
+EXTRA_DIST = NTMakefile
\ No newline at end of file
diff --git a/appl/ftp/common/Makefile.am b/appl/ftp/common/Makefile.am
index cfe1bb625..1b0ebf2bf 100644
--- a/appl/ftp/common/Makefile.am
+++ b/appl/ftp/common/Makefile.am
@@ -10,3 +10,5 @@ libcommon_a_SOURCES = \
 	sockbuf.c \
 	buffer.c \
 	common.h
+
+EXTRA_DIST = NTMakefile
\ No newline at end of file
diff --git a/appl/ftp/ftp/Makefile.am b/appl/ftp/ftp/Makefile.am
index c53d858e9..e47580dfc 100644
--- a/appl/ftp/ftp/Makefile.am
+++ b/appl/ftp/ftp/Makefile.am
@@ -41,4 +41,4 @@ LDADD = \
 	$(LIB_roken) \
 	$(LIB_readline)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/ftp/ftpd/Makefile.am b/appl/ftp/ftpd/Makefile.am
index cc0ad840f..355b8baae 100644
--- a/appl/ftp/ftpd/Makefile.am
+++ b/appl/ftp/ftpd/Makefile.am
@@ -51,4 +51,4 @@ LDADD = ../common/libcommon.a \
 	$(LIB_hcrypto) \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/gssmask/Makefile.am b/appl/gssmask/Makefile.am
index c78f6a67d..55673a039 100644
--- a/appl/gssmask/Makefile.am
+++ b/appl/gssmask/Makefile.am
@@ -9,3 +9,5 @@ gssmask_SOURCES = gssmask.c common.c common.h protocol.h
 gssmaestro_SOURCES = gssmaestro.c common.c common.h protocol.h
 
 LDADD = $(top_builddir)/lib/gssapi/libgssapi.la $(LIB_roken) $(top_builddir)/lib/krb5/libkrb5.la
+
+EXTRA_DIST = NTMakefile
diff --git a/appl/kf/Makefile.am b/appl/kf/Makefile.am
index eb78cca99..0b38057ca 100644
--- a/appl/kf/Makefile.am
+++ b/appl/kf/Makefile.am
@@ -17,4 +17,4 @@ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/kx/Makefile.am b/appl/kx/Makefile.am
index b5f026ca4..37036bd58 100644
--- a/appl/kx/Makefile.am
+++ b/appl/kx/Makefile.am
@@ -46,7 +46,7 @@ kxd_SOURCES = \
 
 EXTRA_kxd_SOURCES = writeauth.c
 
-EXTRA_DIST = rxterm.in rxtelnet.in tenletxr.in $(man_MANS)
+EXTRA_DIST = NTMakefile rxterm.in rxtelnet.in tenletxr.in $(man_MANS)
 
 man_MANS = kx.1 rxtelnet.1 rxterm.1 tenletxr.1 kxd.8
 
diff --git a/appl/login/Makefile.am b/appl/login/Makefile.am
index 3c412fe51..c5a838d7a 100644
--- a/appl/login/Makefile.am
+++ b/appl/login/Makefile.am
@@ -37,4 +37,4 @@ $(srcdir)/login-protos.h:
 
 $(login_OBJECTS): $(srcdir)/login-protos.h
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/otp/Makefile.am b/appl/otp/Makefile.am
index 9c8a64d4b..07ab13882 100644
--- a/appl/otp/Makefile.am
+++ b/appl/otp/Makefile.am
@@ -14,4 +14,4 @@ otpprint_LDADD  = $(LIB_hcrypto) $(LIB_roken) $(top_builddir)/lib/otp/libotp.la
 
 man_MANS = otp.1  otpprint.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/popper/Makefile.am b/appl/popper/Makefile.am
index 10075a2bd..2fb612dd6 100644
--- a/appl/popper/Makefile.am
+++ b/appl/popper/Makefile.am
@@ -44,6 +44,6 @@ LDADD = \
 
 man_MANS = popper.8
 
-EXTRA_DIST = pop3.rfc1081 pop3e.rfc1082 \
+EXTRA_DIST = NTMakefile pop3.rfc1081 pop3e.rfc1082 \
 	popper.README.release README-FIRST \
 	$(man_MANS)
diff --git a/appl/push/Makefile.am b/appl/push/Makefile.am
index d98711926..a1b46ed6b 100644
--- a/appl/push/Makefile.am
+++ b/appl/push/Makefile.am
@@ -18,7 +18,7 @@ man_MANS = push.8 pfrom.1
 
 CLEANFILES = pfrom
 
-EXTRA_DIST = pfrom.in $(man_MANS)
+EXTRA_DIST = NTMakefile pfrom.in $(man_MANS)
 
 LDADD = $(LIB_krb5) \
 	$(LIB_hcrypto) \
diff --git a/appl/rcp/Makefile.am b/appl/rcp/Makefile.am
index e635d8987..39d67be05 100644
--- a/appl/rcp/Makefile.am
+++ b/appl/rcp/Makefile.am
@@ -10,6 +10,6 @@ rcp_SOURCES  = rcp.c util.c rcp_locl.h extern.h
 
 man_MANS = rcp.1
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
 
 LDADD = $(LIB_roken)
diff --git a/appl/rsh/Makefile.am b/appl/rsh/Makefile.am
index 76c9bd5aa..2cd18752f 100644
--- a/appl/rsh/Makefile.am
+++ b/appl/rsh/Makefile.am
@@ -25,4 +25,4 @@ LDADD = $(LIB_kafs) \
 	$(LIB_hcrypto) \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/su/Makefile.am b/appl/su/Makefile.am
index 97b0e7a40..892bcaf42 100644
--- a/appl/su/Makefile.am
+++ b/appl/su/Makefile.am
@@ -15,4 +15,4 @@ LDADD = $(LIB_kafs) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/telnet/Makefile.am b/appl/telnet/Makefile.am
index 88493594d..db43430aa 100644
--- a/appl/telnet/Makefile.am
+++ b/appl/telnet/Makefile.am
@@ -8,4 +8,4 @@ dist-hook:
 	$(mkinstalldirs) $(distdir)/arpa
 	$(INSTALL_DATA) $(srcdir)/arpa/telnet.h $(distdir)/arpa
 
-EXTRA_DIST = README.ORIG telnet.state
+EXTRA_DIST = NTMakefile README.ORIG telnet.state
diff --git a/appl/telnet/libtelnet/Makefile.am b/appl/telnet/libtelnet/Makefile.am
index 929578681..66571d5db 100644
--- a/appl/telnet/libtelnet/Makefile.am
+++ b/appl/telnet/libtelnet/Makefile.am
@@ -20,4 +20,4 @@ libtelnet_a_SOURCES = \
 	misc.c		\
 	misc.h
 
-EXTRA_DIST = rsaencpwd.c spx.c
+EXTRA_DIST = NTMakefile rsaencpwd.c spx.c
diff --git a/appl/telnet/telnet/Makefile.am b/appl/telnet/telnet/Makefile.am
index fa3020714..34e0fe641 100644
--- a/appl/telnet/telnet/Makefile.am
+++ b/appl/telnet/telnet/Makefile.am
@@ -21,4 +21,4 @@ LDADD = ../libtelnet/libtelnet.a \
 	$(LIB_kdfs) \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/telnet/telnetd/Makefile.am b/appl/telnet/telnetd/Makefile.am
index f1a111975..d8f5b19f3 100644
--- a/appl/telnet/telnetd/Makefile.am
+++ b/appl/telnet/telnetd/Makefile.am
@@ -24,4 +24,4 @@ LDADD = \
 	$(LIB_kdfs) \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/appl/test/Makefile.am b/appl/test/Makefile.am
index 67801c9e1..7cbaf07d4 100644
--- a/appl/test/Makefile.am
+++ b/appl/test/Makefile.am
@@ -40,3 +40,5 @@ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
+
+EXTRA_DIST = NTMakefile
diff --git a/appl/xnlock/Makefile.am b/appl/xnlock/Makefile.am
index f073d6810..f971d18c3 100644
--- a/appl/xnlock/Makefile.am
+++ b/appl/xnlock/Makefile.am
@@ -21,7 +21,8 @@ CHECK_LOCAL = no-check-local
 man_MANS = xnlock.1
 
 EXTRA_DIST = $(man_MANS) nose.0.left nose.0.right nose.1.left nose.1.right \
-	nose.down nose.front nose.left.front nose.right.front
+	nose.down nose.front nose.left.front nose.right.front \
+	NTMakefile
 
 LDADD = \
 	$(LIB_kafs) \
diff --git a/base/Makefile.am b/base/Makefile.am
index 7eab0d61d..4be434816 100644
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -26,4 +26,4 @@ dist_libheimbase_la_SOURCES =	\
 
 test_base_LDADD = $(LIB_heimbase)
 
-EXTRA_DIST = version-script.map
+EXTRA_DIST = NTMakefile version-script.map
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 78ff2b5b9..0f4957046 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -115,6 +115,7 @@ heimdal_TEXINFOS = \
 	win2k.texi
 
 EXTRA_DIST = \
+	NTMakefile \
 	doxyout \
 	footer.html \
 	gssapi.din \
diff --git a/etc/Makefile.am b/etc/Makefile.am
index a25d86553..6736bbc8f 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -2,4 +2,4 @@
 
 include $(top_srcdir)/Makefile.am.common
 
-EXTRA_DIST = services.append
+EXTRA_DIST = NTMakefile services.append
diff --git a/include/Makefile.am b/include/Makefile.am
index bb0d4302a..c9425c8e5 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 = krb5-types.cross
+EXTRA_DIST = NTMakefile krb5-types.cross
 
 if !CROSS_COMPILE
 
diff --git a/include/gssapi/Makefile.am b/include/gssapi/Makefile.am
index 403116b53..c0b050864 100644
--- a/include/gssapi/Makefile.am
+++ b/include/gssapi/Makefile.am
@@ -4,3 +4,4 @@ include $(top_srcdir)/Makefile.am.common
 
 CLEANFILES = gssapi.h gssapi_krb5.h gssapi_spnego.h gssapi_ntlm.h gssapi_oid.h
 
+EXTRA_DIST = NTMakefile
diff --git a/include/hcrypto/Makefile.am b/include/hcrypto/Makefile.am
index f1ae98d1e..4b76909d6 100644
--- a/include/hcrypto/Makefile.am
+++ b/include/hcrypto/Makefile.am
@@ -26,3 +26,5 @@ CLEANFILES =		\
 	rsa.h		\
 	sha.h		\
 	ui.h
+
+EXTRA_DIST = NTMakefile
diff --git a/include/kadm5/Makefile.am b/include/kadm5/Makefile.am
index 19d782e13..d0ce25d3f 100644
--- a/include/kadm5/Makefile.am
+++ b/include/kadm5/Makefile.am
@@ -4,3 +4,5 @@ include $(top_srcdir)/Makefile.am.common
 
 CLEANFILES = admin.h kadm5_err.h private.h
 CLEANFILES += kadm5-private.h kadm5-protos.h kadm5-pwcheck.h
+
+EXTRA_DIST = NTMakefile
diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 327ee1d05..1a01b48a2 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -89,4 +89,4 @@ add_random_users_LDADD = \
 
 test_util_LDADD = $(kadmin_LDADD)
 
-EXTRA_DIST = $(man_MANS) kadmin-commands.in
+EXTRA_DIST = NTMakefile $(man_MANS) kadmin-commands.in
diff --git a/kcm/Makefile.am b/kcm/Makefile.am
index 8d22eda33..682997010 100644
--- a/kcm/Makefile.am
+++ b/kcm/Makefile.am
@@ -42,4 +42,4 @@ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
 	$(LIB_door_create) \
 	$(LIB_pidfile)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index bcf222324..ca815bdda 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -128,4 +128,4 @@ krb5_HEADERS = windc_plugin.h
 
 build_HEADERZ = $(krb5_HEADERS) # XXX
 
-EXTRA_DIST = $(man_MANS) version-script.map
+EXTRA_DIST = NTMakefile $(man_MANS) version-script.map
diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index 2c1d3056c..4965cea3c 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -29,4 +29,4 @@ LDADD = $(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS)
+EXTRA_DIST = NTMakefile $(man_MANS)
diff --git a/kuser/Makefile.am b/kuser/Makefile.am
index 0d41343a4..d4cdb70d8 100644
--- a/kuser/Makefile.am
+++ b/kuser/Makefile.am
@@ -72,7 +72,7 @@ LDADD = \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_roken)
 
-EXTRA_DIST = $(man_MANS) \
+EXTRA_DIST = NTMakefile $(man_MANS) \
 	kuser_locl.h kcc-commands.in kdigest-commands.in copy_cred_cache.1
 
 # make sure install-exec-hook doesn't have any commands in Makefile.am.common
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 54007a373..bed19304a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -41,3 +41,5 @@ SUBDIRS = \
 	kadm5 \
 	$(dir_otp) \
 	$(dir_dce)
+
+EXTRA_DIST = NTMakefile heimdal
\ No newline at end of file
diff --git a/lib/asn1/Makefile.am b/lib/asn1/Makefile.am
index acfa0a30d..437244871 100644
--- a/lib/asn1/Makefile.am
+++ b/lib/asn1/Makefile.am
@@ -226,6 +226,7 @@ test_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/test.asn1
 
 
 EXTRA_DIST =		\
+	NTMakefile	\
 	cms.asn1	\
 	cms.opt		\
 	asn1_err.et	\
diff --git a/lib/com_err/Makefile.am b/lib/com_err/Makefile.am
index 3def3d049..2942dc27c 100644
--- a/lib/com_err/Makefile.am
+++ b/lib/com_err/Makefile.am
@@ -38,4 +38,4 @@ snprintf.c:
 strlcpy.c:
 	$(LN_S) $(srcdir)/../roken/strlcpy.c .
 
-EXTRA_DIST = version-script.map
+EXTRA_DIST = NTMakefile version-script.map
diff --git a/lib/gssapi/Makefile.am b/lib/gssapi/Makefile.am
index 253caacdf..d3063b04a 100644
--- a/lib/gssapi/Makefile.am
+++ b/lib/gssapi/Makefile.am
@@ -333,6 +333,7 @@ gss-commands.c gss-commands.h: gss-commands.in
 $(gsstool_OBJECTS): gss-commands.h
 
 EXTRA_DIST = \
+	NTMakefile \
 	$(man_MANS) \
 	krb5/gkrb5_err.et \
 	mech/gssapi.asn1 \
diff --git a/lib/hcrypto/Makefile.am b/lib/hcrypto/Makefile.am
index 145f81689..80a63367e 100644
--- a/lib/hcrypto/Makefile.am
+++ b/lib/hcrypto/Makefile.am
@@ -313,6 +313,7 @@ CLEANFILES = \
 	test_crypto.tmp
 
 EXTRA_DIST = \
+	NTMakefile \
 	DESperate.txt \
 	dllmain.c \
 	ec.h \
diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index 45d543f4f..ba28235b5 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -131,6 +131,7 @@ test_mkey_LIBS = $(test_hdbkeys_LIBS)
 hdb_err.h: hdb_err.et
 
 EXTRA_DIST = \
+	NTMakefile \
 	hdb.asn1 \
 	hdb_err.et \
 	hdb.schema \
diff --git a/lib/hx509/Makefile.am b/lib/hx509/Makefile.am
index cde55c596..cd051316b 100644
--- a/lib/hx509/Makefile.am
+++ b/lib/hx509/Makefile.am
@@ -299,6 +299,7 @@ test_query: test_query.in Makefile
 	mv test_query.tmp test_query
 
 EXTRA_DIST = \
+	NTMakefile \
 	version-script.map \
 	crmf.asn1 \
 	hx509_err.et \
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index dd311fdc6..ea6cc0105 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -179,6 +179,7 @@ $(srcdir)/kadm5-private.h:
 		|| rm -f kadm5-private.h
 
 EXTRA_DIST = \
+	NTMakefile \
 	kadm5_err.et \
 	iprop-commands.in \
 	$(man_MANS) \
diff --git a/lib/kafs/Makefile.am b/lib/kafs/Makefile.am
index 9624d15a9..34a6144c7 100644
--- a/lib/kafs/Makefile.am
+++ b/lib/kafs/Makefile.am
@@ -71,7 +71,7 @@ nodist_libkafs_la_SOURCES = $(ROKEN_SRCS)
 
 EXTRA_libkafs_la_SOURCES = afskrb5.c afslib.c
 
-EXTRA_DIST = afsl.exp afslib.exp $(man_MANS)
+EXTRA_DIST = NTMakefile afsl.exp afslib.exp $(man_MANS)
 
 man_MANS = kafs.3
 
diff --git a/lib/kdfs/Makefile.am b/lib/kdfs/Makefile.am
index 6732efc4d..e31b2408a 100644
--- a/lib/kdfs/Makefile.am
+++ b/lib/kdfs/Makefile.am
@@ -8,3 +8,5 @@ libkdfs_la_SOURCES = \
 	k5dfspag.c
 
 libkdfs_la_LDFLAGS = -version-info 0:3:0
+
+EXTRA_DIST = NTMakefile
diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am
index d5679ebce..203049d8b 100644
--- a/lib/krb5/Makefile.am
+++ b/lib/krb5/Makefile.am
@@ -355,6 +355,7 @@ test_config_strings.out: test_config_strings.cfg
 	$(CP) $(srcdir)/test_config_strings.cfg test_config_strings.out
 
 EXTRA_DIST = \
+	NTMakefile \
 	krb5_err.et \
 	krb_err.et \
 	heim_err.et \
diff --git a/lib/ntlm/Makefile.am b/lib/ntlm/Makefile.am
index da9904b39..adbcb9374 100644
--- a/lib/ntlm/Makefile.am
+++ b/lib/ntlm/Makefile.am
@@ -37,7 +37,7 @@ check_PROGRAMS = test_ntlm
 
 LDADD = libheimntlm.la $(LIB_roken)
 
-EXTRA_DIST = version-script.map ntlm_err.et
+EXTRA_DIST = NTMakefile version-script.map ntlm_err.et
 
 CLEANFILES = \
 	ntlm_err.c ntlm_err.h
diff --git a/lib/otp/Makefile.am b/lib/otp/Makefile.am
index ee275d9d3..ad5b07019 100644
--- a/lib/otp/Makefile.am
+++ b/lib/otp/Makefile.am
@@ -82,4 +82,4 @@ CLEANFILES = \
 	strlwr.c \
 	strncasecmp.c
 
-EXTRA_DIST = version-script.map
+EXTRA_DIST = NTMakefile version-script.map
diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index b41c3b851..e72328810 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -230,6 +230,7 @@ endif
 
 
 EXTRA_DIST = \
+	NTMakefile \
 	roken.awk roken.h.in \
 	$(man_MANS) \
 	test-mem.h \
diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am
index 1b585016e..c49353f88 100644
--- a/lib/sl/Makefile.am
+++ b/lib/sl/Makefile.am
@@ -47,3 +47,5 @@ getprogname.c:
 	$(LN_S) $(srcdir)/../roken/getprogname.c .
 
 slc-lex.c: slc-gram.h
+
+EXTRA_DIST = NTMakefile
diff --git a/lib/sqlite/Makefile.am b/lib/sqlite/Makefile.am
index a04acc5d9..2ca8bfd64 100644
--- a/lib/sqlite/Makefile.am
+++ b/lib/sqlite/Makefile.am
@@ -9,3 +9,5 @@ noinst_HEADERS = sqlite3.h sqlite3ext.h
 libheimsqlite_la_SOURCES = sqlite3.c
 
 libheimsqlite_la_LIBADD = $(PTHREAD_LIBADD)
+
+EXTRA_DIST = NTMakefile
diff --git a/lib/vers/Makefile.am b/lib/vers/Makefile.am
index b8dadcb2f..434401f95 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 = $(build_HEADERZ)
+EXTRA_DIST = NTMakefile $(build_HEADERZ)
diff --git a/lib/wind/Makefile.am b/lib/wind/Makefile.am
index 2abc06ee4..60892db55 100644
--- a/lib/wind/Makefile.am
+++ b/lib/wind/Makefile.am
@@ -112,6 +112,7 @@ punycode_examples.h punycode_examples.c: gen-punycode-examples.py rfc3492.txt
 	$(PYTHON) $(srcdir)/gen-punycode-examples.py $(srcdir)/rfc3492.txt $(builddir)
 
 EXTRA_DIST = \
+	NTMakefile \
 	CompositionExclusions-3.2.0.txt \
 	DerivedNormalizationProps.txt \
 	NormalizationCorrections.txt \
diff --git a/packages/Makefile.am b/packages/Makefile.am
index ad8a67a62..a3ee980b0 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -4,4 +4,4 @@ include $(top_srcdir)/Makefile.am.common
 
 SUBDIRS=  mac
 
-
+EXTRA_DIST = windows
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1cd8498dc..e36f80050 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,3 +9,5 @@ if HAVE_DLOPEN
 SUBDIRS += plugin
 endif
 endif
+
+EXTRA_DIST = NTMakefile
diff --git a/tests/can/Makefile.am b/tests/can/Makefile.am
index 12cd2feaf..8caf29315 100644
--- a/tests/can/Makefile.am
+++ b/tests/can/Makefile.am
@@ -44,6 +44,7 @@ CLEANFILES= $(TESTS) *.tmp *.cf \
 	test_can
 
 EXTRA_DIST = \
+	NTMakefile \
 	apple-10.4.kadm \
 	apple-10.4.req \
 	check-can.in \
diff --git a/tests/db/Makefile.am b/tests/db/Makefile.am
index 0d488dc1b..22f0568de 100644
--- a/tests/db/Makefile.am
+++ b/tests/db/Makefile.am
@@ -71,6 +71,7 @@ CLEANFILES= \
 	messages.log
 
 EXTRA_DIST = \
+	NTMakefile \
 	check-aliases.in \
 	check-dbinfo.in \
 	loaddump-db.in \
diff --git a/tests/gss/Makefile.am b/tests/gss/Makefile.am
index 2df571013..ff7a99881 100644
--- a/tests/gss/Makefile.am
+++ b/tests/gss/Makefile.am
@@ -70,6 +70,7 @@ CLEANFILES= \
 	check-context.tmp
 
 EXTRA_DIST = \
+	NTMakefile \
 	check-basic.in \
 	check-gss.in \
 	check-gssmask.in \
diff --git a/tests/java/Makefile.am b/tests/java/Makefile.am
index 7785ca1aa..9b695f772 100644
--- a/tests/java/Makefile.am
+++ b/tests/java/Makefile.am
@@ -37,6 +37,7 @@ CLEANFILES= \
 
 
 EXTRA_DIST = \
+	NTMakefile \
 	KerberosInit.java \
 	jaas.conf \
 	check-kinit.in \
diff --git a/tests/kdc/Makefile.am b/tests/kdc/Makefile.am
index 9838272c4..ecf74e5d1 100644
--- a/tests/kdc/Makefile.am
+++ b/tests/kdc/Makefile.am
@@ -189,6 +189,7 @@ CLEANFILES= \
 	test-rc-file.rc
 
 EXTRA_DIST = \
+	NTMakefile \
 	check-cc.in \
 	check-delegation.in \
 	check-des.in \
diff --git a/tests/ldap/Makefile.am b/tests/ldap/Makefile.am
index b57d2fd29..afd528bf8 100644
--- a/tests/ldap/Makefile.am
+++ b/tests/ldap/Makefile.am
@@ -43,6 +43,7 @@ CLEANFILES= \
 	slapd.pid
 
 EXTRA_DIST = \
+	NTMakefile \
 	samba.schema \
 	slapd.conf \
 	slapd-stop \
diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am
index deddbcc2e..002f2ade9 100644
--- a/tests/plugin/Makefile.am
+++ b/tests/plugin/Makefile.am
@@ -39,5 +39,6 @@ CLEANFILES= \
 	messages.log
 
 EXTRA_DIST = \
+	NTMakefile \
 	check-pac.in \
 	krb5.conf.in
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bdfa08ca3..36eed71d7 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -40,6 +40,7 @@ heimdal-gssapi.pc: heimdal-gssapi.pc.in
 	mv $@.new $@
 
 EXTRA_DIST = \
+	NTMakefile \
 	$(man_MANS) \
 	krb5-config.in \
 	heimdal-gssapi.pc.in \