diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index c63ae06d4..3d9077d1d 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -54,12 +54,18 @@ DEBUGOPT=-$(BUILD)
 ######################################################################
 # Heimdal Merge Modules
 
+!if exist(thirdparty\installer\heimdal-assemblies.wxs)
+ASM_WXS=thirdparty\installer\heimdal-assemblies.wxs
+!else
+ASM_WXS=heimdal-assemblies.wxs
+!endif
+
 ASSEMBLYMODULE=$(INSTDIR)\Heimdal.msm
 
 $(ASSEMBLYMODULE): $(OBJ)\heimdal-assemblies.wixobj
 	$(LIGHT) -out $@ $**
 
-$(OBJ)\heimdal-assemblies.wixobj: heimdal-assemblies.wxs
+$(OBJ)\heimdal-assemblies.wixobj: $(ASM_WXS)
 	$(CANDLE) -arch $(PLATFORM) -o $@ $**	\
 		-dVersion=$(VERSION)		\
 		-dBinDir=$(BINDIR)		\
@@ -69,12 +75,18 @@ $(OBJ)\heimdal-assemblies.wixobj: heimdal-assemblies.wxs
 $(SDKREDISTDIR)\Heimdal.msm: $(ASSEMBLYMODULE)
 	$(CP) $** $@
 
+!if exist(thirdparty\installer\heimdal-policy.wxs)
+POLICY_WXS=thirdparty\installer\heimdal-policy.wxs
+!else
+POLICY_WXS=heimdal-policy.wxs
+!endif
+
 POLICYMODULE=$(INSTDIR)\Heimdal.Policy.msm
 
 $(POLICYMODULE): $(OBJ)\heimdal-policy.wixobj
 	$(LIGHT) -out $@ $**
 
-$(OBJ)\heimdal-policy.wixobj: heimdal-policy.wxs
+$(OBJ)\heimdal-policy.wixobj: $(POLICY_WXS)
 	$(CANDLE) -arch $(PLATFORM) -o $@ $**	\
 		-dVersion=$(VERSION)		\
 		-dBinDir=$(BINDIR)		\
@@ -102,10 +114,7 @@ all:: $(POLICYMODULE) $(SDKREDISTDIR)\Heimdal.Policy.msm
 all:: $(COMMANDMODULE) $(SDKREDISTDIR)\Heimdal.Command.msm
 
 clean::
-	-$(RM) $(ASSEMBLYMODULE)
-	-$(RM) $(POLICYMODULE)
-	-$(RM) $(SDKREDISTDIR)\Heimdal.msm
-	-$(RM) $(SDKREDISTDIR)\Heimdal.Policy.msm
+	-$(RM) $(SDKREDISTDIR)\*.*
 
 ######################################################################
 # Runtime modules
@@ -191,15 +200,6 @@ CANDLEOPTS=$(CANDLEOPTS) -dTarget32		\
 
 !endif
 
-!if exist($(SRC)\thirdparty)
-THIRDPARTYOBJS=$(INSTDIR)\apicache.wixobj $(INSTDIR)\lsacache.wixobj
-THIRDPARTYOPTS=-dApiCache=1 -dLsaCache=1
-
-!if "$(CPU)"=="AMD64"
-THIRDPARTYOBJS=$(THIRDPARTYOBJS) $(INSTDIR32)\apicache.wixobj $(INSTDIR32)\lsacache.wixobj
-!endif
-!endif
-
 !if exist($(SRC)\thirdparty\MKShim)
 THIRDPARTYOBJS=$(THIRDPARTYOBJS) $(INSTDIR)\MKShim.wixlib
 THIRDPARTYOPTS=$(THIRDPARTYOPTS) -dMKShim=1
@@ -223,6 +223,12 @@ $(WIXOBJ): heimdal-installer.wxs
 	$(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \
 		$(CANDLEOPTS) $(THIRDPARTYOPTS)
 
+!if exist(thirdparty\installer\heimdal-command.wxs)
+CMD_WXS=thirdparty\installer\heimdal-command.wxs
+!else
+CMD_WXS=heimdal-command.wxs
+!endif
+
 $(OBJ)\heimdal-command.wixobj: heimdal-command.wxs
 	$(CANDLE) -arch $(PLATFORM) -o $@ heimdal-command.wxs \
 		$(CANDLEOPTS) $(THIRDPARTYOPTS)
diff --git a/packages/windows/installer/heimdal-assemblies.wxs b/packages/windows/installer/heimdal-assemblies.wxs
index dcd617465..006ba7b68 100644
--- a/packages/windows/installer/heimdal-assemblies.wxs
+++ b/packages/windows/installer/heimdal-assemblies.wxs
@@ -3,15 +3,15 @@
 
   <?if $(var.Platform)=x64 ?>
 
-  <?define Win64=yes ?>
-  <?define GuidPackage=4F062DF3-5C5F-44E9-8F9B-E8D2684ED608 ?>
-  <?define GuidKerberos=78905402-0F4B-48E1-924C-B0E18657C5C5 ?>
+    <?define Win64=yes ?>
+    <?define GuidPackage=4F062DF3-5C5F-44E9-8F9B-E8D2684ED608 ?>
+    <?define GuidKerberos=78905402-0F4B-48E1-924C-B0E18657C5C5 ?>
 
   <?else?>
 
-  <?define Win64=no ?>
-  <?define GuidPackage=AD5288E3-A024-4BD3-ABBE-4999AF130169 ?>
-  <?define GuidKerberos=C5919968-FEC4-4D17-89A4-8697B95F115E ?>
+    <?define Win64=no ?>
+    <?define GuidPackage=AD5288E3-A024-4BD3-ABBE-4999AF130169 ?>
+    <?define GuidKerberos=C5919968-FEC4-4D17-89A4-8697B95F115E ?>
 
   <?endif?>
 
@@ -19,7 +19,7 @@
 
     <Package Id="$(var.GuidPackage)"
              InstallerVersion="200"
-             Languages="1033" Manufacturer="Heimdal"
+	     Languages="1033" Manufacturer="www.h5l.org"
              SummaryCodepage="1252" AdminImage="no"
              Platform="$(var.Platform)" />
 
@@ -34,10 +34,14 @@
           <File Name="com_err.dll" />
           <File Name="heimntlm.dll" />
           <File Name="gssapi.dll" />
+	  <File Name="libhdb.dll" />
+	  <File Name="libkadm5srv.dll" />
           <File Name="heimdal.pdb" />
           <File Name="com_err.pdb" />
           <File Name="heimntlm.pdb" />
           <File Name="gssapi.pdb" />
+	  <File Name="libhdb.pdb" />
+	  <File Name="libkadm5srv.pdb" />
 	  <File Name="$(var.AsmKrbName).cat" />
 	  <File Name="$(var.AsmKrbName).manifest" Id="id.Heimdal.Kerberos.manifest" />
         </Component>
diff --git a/packages/windows/installer/heimdal-command.wxs b/packages/windows/installer/heimdal-command.wxs
index 1d63ebc88..29e098846 100644
--- a/packages/windows/installer/heimdal-command.wxs
+++ b/packages/windows/installer/heimdal-command.wxs
@@ -189,30 +189,6 @@
 
     </DirectoryRef>
 
-    <?ifdef Target32?>
-    <DirectoryRef Id='PLUGINDIR32'>
-      <Component Id='comp.Plugin.Reg.32'
-		 Guid='4BC44234-70A4-4CC1-A5AF-4CA76E9F9487' Win64='no'>
-	<RegistryKey Root='HKLM' Key='Software\Heimdal'>
-	  <RegistryValue Name='plugin_dir' Type='multiString' Action='append'
-			 Value='"[PLUGINDIR32]"' KeyPath='yes' />
-	</RegistryKey>
-      </Component>
-    </DirectoryRef>
-    <?endif?>
-
-    <?ifdef Target64?>
-    <DirectoryRef Id='PLUGINDIR64'>
-      <Component Id='comp.Plugin.Reg.64'
-		 Guid='5A99A52E-A4CD-40F8-AFFD-AD61939FC547' Win64='yes'>
-	<RegistryKey Root='HKLM' Key='Software\Heimdal'>
-	  <RegistryValue Name='plugin_dir' Type='multiString' Action='append'
-			 Value='"[PLUGINDIR64]"' KeyPath='yes' />
-	</RegistryKey>
-      </Component>
-    </DirectoryRef>
-    <?endif?>
-
     <DirectoryRef Id='TARGETDIR'>
       <Directory Id='CommonAppDataFolder' Name='ProgramData'>
 	<Directory Id='dirCommonKerberos' Name='Kerberos' FileSource='$(var.SrcDir)'>
@@ -305,21 +281,5 @@
     </Property>
     <?endif?>
 
-    <?ifdef LsaCache ?>
-    <?ifdef Target64?>
-    <ComponentGroupRef Id='comps.LSACache.64' />
-    <?else?>
-    <ComponentGroupRef Id='comps.LSACache.32' />
-    <?endif?>
-    <?endif?>
-
-    <?ifdef ApiCache ?>
-    <?ifdef Target64?>
-    <ComponentGroupRef Id='comps.APICache.64' />
-    <?else?>
-    <ComponentGroupRef Id='comps.APICache.32' />
-    <?endif?>
-    <?endif?>
-
   </Module>
 </Wix>
diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index ec78974cc..77eb2f14c 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -338,22 +338,6 @@
       <ComponentRef Id='comp.kvno' />
       <ComponentRef Id='comp.heimtools' />
 
-      <?ifdef LsaCache ?>
-      <?ifdef Target64?>
-      <ComponentGroupRef Id='comps.LSACache.64' />
-      <?else?>
-      <ComponentGroupRef Id='comps.LSACache.32' />
-      <?endif?>
-      <?endif?>
-
-      <?ifdef ApiCache ?>
-      <?ifdef Target64?>
-      <ComponentGroupRef Id='comps.APICache.64' />
-      <?else?>
-      <ComponentGroupRef Id='comps.APICache.32' />
-      <?endif?>
-      <?endif?>
-
       <?ifdef MKShim ?>
       <?ifdef Target64?>
       <ComponentGroupRef Id='comp.Heimdal.MKShim.64' />
@@ -381,12 +365,6 @@
                Title='!(loc.Fea32BitTitle)'
                Description='!(loc.Fea32BitDesc)'
                Level='1' TypicalDefault='install' InstallDefault='local'>
-        <?ifdef LsaCache ?>
-        <ComponentGroupRef Id='comps.LSACache.32' />
-        <?endif?>
-        <?ifdef ApiCache ?>
-        <ComponentGroupRef Id='comps.APICache.32' />
-        <?endif?>
         <?ifdef MKShim ?>
         <ComponentGroupRef Id='comp.Heimdal.MKShim.32' />
         <?endif?>