diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index 0a328e948..3b0c07780 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -112,6 +112,11 @@ THIRDPARTYOBJS=$(INSTDIR)\apicache.wixobj $(INSTDIR)\lsacache.wixobj
 THIRDPARTYOPT=-dApiCache=1 -dLsaCache=1
 !endif
 
+!ifdef MKSHIMDIR
+THIRDPARTYOBJS=$(THIRDPARTYOBJS) $(MKSHIMDIR)\out\dest_$(OUTDIR)\install\MKShim.wixlib
+THIRDPARTYOPT=$(THIRDPARTYOPTS) -dMKShim=1
+!endif
+
 INSTALLER=$(INSTDIR)\Heimdal-$(CPU)$(DEBUGOPT)-$(VERSIOND).msi
 
 $(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(MERGEMOD) $(THIRDPARTYOBJS)	\
diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index 7bfd8f1a8..b63313831 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -311,6 +311,10 @@
       <ComponentGroupRef Id='comp.Heimdal.Thirdparty' />
       <?endif?>
 
+      <?ifdef MKShim ?>
+      <ComponentGroupRef Id='comp.Heimdal.MKShim' />
+      <?endif?>
+
     </Feature>
 
     <!-- Properties for Add/Remove Programs -->