diff --git a/packages/windows/assembly/Heimdal.Application.manifest.in b/packages/windows/assembly/Heimdal.Application.manifest.in
new file mode 100644
index 000000000..1c6645e3d
--- /dev/null
+++ b/packages/windows/assembly/Heimdal.Application.manifest.in
@@ -0,0 +1,24 @@
+<?xml version="1" encoding="UTF-8" standalone="yes" ?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity type="win32" name=""
+		    processorArchitecture="@cpu@"
+		    version="1.0.0.0" />
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="@krbname@"
+			language="*"
+			processorArchitecture="@cpu@"
+			version="@krbversion@"
+			publickeytoken="@pkt@" />
+    </dependentAssembly>
+  </dependency>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type="win32" name="@gssname@"
+			language="*"
+			processorArchitecture="@cpu@"
+			version="@gssversion@"
+			publickeytoken="@pkt@" />
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/packages/windows/assembly/Heimdal.GSSAPI.manifest.in b/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
index dc024b60e..09d01445e 100644
--- a/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
+++ b/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
@@ -1,5 +1,5 @@
 <?xml version="1" encoding="UTF-8" standalone="yes" ?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1">
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity type="win32" name="@name@"
 		    processorArchitecture="@cpu@"
 		    version="@version@"
@@ -8,6 +8,7 @@
   <dependency>
     <dependentAssembly>
       <assemblyIdentity type="win32" name="@krbname@"
+			language="*"
 			processorArchitecture="@cpu@"
 			version="@krbversion@"
 			publickeytoken="@pkt@" />
diff --git a/packages/windows/assembly/Heimdal.Kerberos.manifest.in b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
index 83466a2fd..9d43c5532 100644
--- a/packages/windows/assembly/Heimdal.Kerberos.manifest.in
+++ b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
@@ -1,5 +1,5 @@
 <?xml version="1" encoding="UTF-8" standalone="yes" ?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1">
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity type="win32" name="@name@"
 		    processorArchitecture="@cpu@"
 		    version="@version@"
diff --git a/packages/windows/assembly/NTMakefile b/packages/windows/assembly/NTMakefile
index 6314438e5..97f3209ce 100644
--- a/packages/windows/assembly/NTMakefile
+++ b/packages/windows/assembly/NTMakefile
@@ -33,6 +33,14 @@ RELDIR=packages\windows\assembly
 
 !include ../../../windows/NTMakefile.w32
 
+!  if "$(CPU)"=="i386" || "$(CPU)"=="x86"
+MCPU=x86
+!  elseif "$(CPU)"=="AMD64"
+MCPU=amd64
+!  else
+!    error Unknown CPU
+!  endif
+
 # CODESIGN_PKT should be set to the public key token of the code
 # signing certificate in use.  You can use :
 #
@@ -63,7 +71,7 @@ $(ASMKRBDIR)\$(ASMKRBMAN).nohash: Heimdal.Kerberos.manifest.in
 
 $(ASMKRBDIR)\$(ASMKRBMAN) $(ASMKRBDIR)\$(ASMKRBMAN).cdf: \
 		$(ASMKRBDIR)\$(ASMKRBMAN).nohash $(ASMKRBBINS)
-	$(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN).nohash -out:$@ -hashupdate -makecdfs
+	$(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN).nohash -out:$(ASMKRBDIR)\$(ASMKRBMAN) -hashupdate -makecdfs
 
 $(ASMKRBDIR)\$(ASMKRBNAME).cat: $(ASMKRBDIR)\$(ASMKRBMAN).cdf
 	cd $(ASMKRBDIR)
@@ -86,6 +94,9 @@ clean::
 {$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
 	$(CP) $< $@
 
+test::
+	$(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN) -validate_manifest
+
 # ----------------------------------------------------------------------
 # Heimdal.GSSAPI Assembly
 
@@ -128,6 +139,30 @@ clean::
 {$(BINDIR)}.dll{$(ASMGSSDIR)}.dll:
 	$(CP) $< $@
 
+test::
+	$(MT) -manifest $(ASMGSSDIR)\$(ASMGSSMAN) -validate_manifest
+
+# ----------------------------------------------------------------------
+# Application manifests
+
+APPMANIFEST=$(INCDIR)\Heimdal.Application.$(MCPU).manifest
+
+all:: $(APPMANIFEST)
+
+clean::
+	$(RM) $(APPMANIFEST)
+
+$(APPMANIFEST): Heimdal.Application.manifest.in
+	$(SED)  -e "s,[@]gssname[@],$(ASMGSSNAME),g" \
+		-e "s,[@]gssversion[@],$(ASMGSSVER),g" \
+		-e "s,[@]krbname[@],$(ASMKRBNAME),g" \
+		-e "s,[@]krbversion[@],$(ASMKRBVER),g" \
+		-e "s,[@]cpu[@],$(MCPU),g" \
+		-e "s,[@]pkt[@],$(CODESIGN_PKT),g" < $** > $@
+
+test::
+	$(MT) -manifest $(APPMANIFEST) -validate_manifest
+
 # ----------------------------------------------------------------------
 
 .SUFFIXES: .dll
@@ -140,11 +175,3 @@ mk-asm-dirs:
 	$(MKDIR) $(ASMGSSDIR)
 !  endif
 
-!  if "$(CPU)"=="i386" || "$(CPU)"=="x86"
-MCPU=x86
-!  elseif "$(CPU)"=="AMD64"
-MCPU=amd64
-!  else
-!    error Unknown CPU
-!  endif
-