diff --git a/packages/windows/assembly/Heimdal.GSSAPI.manifest.in b/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
index 4484debc9..dcaf8e8fb 100644
--- a/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
+++ b/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
@@ -5,6 +5,7 @@
 		    version="@version@"
 		    publicKeyToken="@pkt@" />
   <file name="gssapi.dll" />
+  <file name="gssapi.pdb" />
   <dependency>
     <dependentAssembly>
       <assemblyIdentity type="win32" name="@krbname@"
diff --git a/packages/windows/assembly/Heimdal.Kerberos.manifest.in b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
index 2c6c7158d..687554b24 100644
--- a/packages/windows/assembly/Heimdal.Kerberos.manifest.in
+++ b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
@@ -7,4 +7,7 @@
   <file name="heimdal.dll" />
   <file name="com_err.dll" />
   <file name="heimntlm.dll" />
+  <file name="heimdal.pdb" />
+  <file name="com_err.pdb" />
+  <file name="heimntlm.pdb" />
 </assembly>
diff --git a/packages/windows/assembly/NTMakefile b/packages/windows/assembly/NTMakefile
index 72e40188f..f9298ef06 100644
--- a/packages/windows/assembly/NTMakefile
+++ b/packages/windows/assembly/NTMakefile
@@ -57,6 +57,9 @@ ASMKRBBINS=\
 	$(ASMKRBDIR)\heimdal.dll	\
 	$(ASMKRBDIR)\com_err.dll	\
 	$(ASMKRBDIR)\heimntlm.dll	\
+	$(ASMKRBDIR)\heimdal.pdb	\
+	$(ASMKRBDIR)\com_err.pdb	\
+	$(ASMKRBDIR)\heimntlm.pdb
 
 $(ASMKRBDIR)\$(ASMKRBMAN).nohash: Heimdal.Kerberos.manifest.in
 	$(SED)  -e "s,[@]name[@],$(ASMKRBNAME),g" \
@@ -86,12 +89,6 @@ all:: asm-krb
 clean::
 	-$(RM) $(ASMKRBDIR)\*.*
 
-{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
-	$(CP) $< $@
-
-{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
-	$(CP) $< $@
-
 test::
 	$(MT) -manifest $(ASMKRBDIR)\$(ASMKRBMAN) -validate_manifest
 
@@ -102,7 +99,9 @@ ASMGSSDIR=$(ASMDIR)\Heimdal.GSSAPI
 ASMGSSVER=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
 ASMGSSMAN=$(ASMGSSNAME).manifest
 
-ASMGSSBINS=$(ASMGSSDIR)\gssapi.dll $(ASMGSSDIR)\gssapi.pdb
+ASMGSSBINS=\
+	$(ASMGSSDIR)\gssapi.dll		\
+	$(ASMGSSDIR)\gssapi.pdb
 
 $(ASMGSSDIR)\$(ASMGSSMAN).nohash: Heimdal.GSSAPI.manifest.in
 	$(SED)  -e "s,[@]name[@],$(ASMGSSNAME),g" \
@@ -217,6 +216,12 @@ clean::
 
 # ----------------------------------------------------------------------
 
+{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
+	$(CP) $< $@
+
+{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
+	$(CP) $< $@
+
 .SUFFIXES: .dll .pdb
 
 mk-asm-dirs:
diff --git a/packages/windows/installer/heimdal-assemblies.wxs b/packages/windows/installer/heimdal-assemblies.wxs
index b7024aa0b..e73f0648f 100644
--- a/packages/windows/installer/heimdal-assemblies.wxs
+++ b/packages/windows/installer/heimdal-assemblies.wxs
@@ -35,6 +35,7 @@
           <File Name="heimntlm.dll" />
           <File Name="heimdal.pdb" />
           <File Name="com_err.pdb" />
+          <File Name="heimntlm.pdb" />
           <File Name="Heimdal.Kerberos.cat" />
           <File Name="Heimdal.Kerberos.manifest" Id="id.Heimdal.Kerberos.manifest" />
         </Component>