diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index c9624ec63..127c2dc91 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -172,6 +172,7 @@ CANDLEOPTS=	\
 	-dDocDir=$(DOCDIR)			\
 	-dSrcDir=$(SRC)				\
 	-dPlatform=$(PLATFORM)			\
+	-dAsmKrbName=$(ASMKRBNAME)		\
 	-dPolPrefix=$(POLPREFIX)
 
 !if "$(CPU)"=="AMD64"
diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index a28ffe581..68fb62af0 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -201,7 +201,7 @@
       <Component Id='comp.gssdll'
 		 Guid='$(var.GuidGssDll)'
 		 Win64='$(var.Win64)'>
-	<File Name='gssapi.dll' KeyPath='yes' />
+	<File Name='gssapi.dll' KeyPath='yes' Source='$(var.BinDir)\$(var.AsmKrbName)\gssapi.dll' />
 	<File Name='gssapi.pdb' />
       </Component>