diff --git a/src/WINNT/install/wix/NTMakefile b/src/WINNT/install/wix/NTMakefile
index d1b75a20db..cd2bd29c51 100644
--- a/src/WINNT/install/wix/NTMakefile
+++ b/src/WINNT/install/wix/NTMakefile
@@ -13,6 +13,7 @@ MEDIADIR = $(DESTDIR)\WinInstall
 MEDIABINDIR = $(MEDIADIR)\Dll
 
 MSIFILE = $(MEDIADIR)\openafs-$(LANG).msi
+BINMSIFILE = $(MEDIADIR)\openafs-32bit-tools-$(LANG).msi
 
 WIXINCLUDES = \
 	config.wxi \
@@ -24,6 +25,7 @@ WIXINCLUDES = \
 	lang\$(LANG)\ui.wxi
 
 WIXOBJ = $(OUT)\openafs-$(LANG).wixobj
+BINWIXOBJ  = $(OUT)\openafs-32bit-tools-$(LANG).wixobj
 
 LANGUAGES=en_US de_DE es_ES ja_JP ko_KR pt_BR zh_CN zh_TW
 
@@ -36,8 +38,9 @@ languages:
 #	$(MAKE) /f NTMakefile /nologo LANG=%l lang
 #	)
 	$(MAKE) /f NTMakefile /nologo LANG=en_US lang
+	
 
-lang:: lang_clean $(MSIFILE)
+lang:: lang_clean $(MSIFILE) $(BINMSIFILE)
 
 uninst: 
         $(CD) uninstall
@@ -49,7 +52,7 @@ customactions:
 	$(MAKE) /f NTMakefile /nologo install
 	$(CD) ..
 
-install: uninst customactions languages 
+install: uninst customactions languages
 
 $(MSIFILE): $(WIXOBJ)
 	light -nologo -out $(MSIFILE) \
@@ -71,6 +74,26 @@ $(WIXOBJ): openafs.wxs $(WIXINCLUDES)
 		-w0 \
         $(AFSDEV_AUXWIXDEFINES)	openafs.wxs
 
+$(BINWIXOBJ): oafwbins.wxs $(WIXINCLUDES)
+	candle -nologo -out $@	\
+		"-dCellName=$(CELLNAME_DEFAULT)" \
+		-dLanguage=$(LANG) \
+		-dNumericVersion=$(AFSPRODUCT_VERSION)	\
+		-dVersionMajor=$(AFSPRODUCT_VER_MAJOR)	\
+		-dVersionMinor=$(AFSPRODUCT_VER_MINOR)	\
+		-dVersionPatch=$(AFSPRODUCT_VER_PATCH)	\
+		"-dDestDir=$(DESTDIR)\\" \
+		-dCellDbFile=CellServDB \
+		-v0 \
+		-w0 \
+        $(AFSDEV_AUXWIXDEFINES)	oafwbins.wxs
+
+$(BINMSIFILE): $(BINWIXOBJ)
+	light -nologo -out $(BINMSIFILE) \
+		-loc lang\en_US\strings.wxl \
+		$(BINWIXOBJ)
+	dir $(BINMSIFILE)
+
 # Cleanup
 clean::
 	for %l in ( $(LANGUAGES) ) do \
@@ -81,7 +104,9 @@ clean::
 	$(CD) uninstall
 	$(MAKE) /f NTMakefile /nologo clean
 	$(CD) ..
-	
+
 lang_clean:
 	-$(DEL) $(WIXOBJ)
 	-$(DEL) $(MSIFILE)
+	-$(DEL) $(BINWIXOBJ)
+	-$(DEL) $(BINMSIFILE)
diff --git a/src/WINNT/install/wix/config.wxi b/src/WINNT/install/wix/config.wxi
index 1d70324530..84c3a7744e 100644
--- a/src/WINNT/install/wix/config.wxi
+++ b/src/WINNT/install/wix/config.wxi
@@ -132,7 +132,7 @@
     <?else?>
         <?error Unknown build type?>
     <?endif?>
-    
+
     <!-- Use the afsloopback.dll instead of instloop.exe -->
     <?define UseDllLoopbackInstaller?>
 
diff --git a/src/WINNT/install/wix/feature.wxi b/src/WINNT/install/wix/feature.wxi
index 006a6fcd56..4d7555379e 100644
--- a/src/WINNT/install/wix/feature.wxi
+++ b/src/WINNT/install/wix/feature.wxi
@@ -1,9 +1,11 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
 <Include>
         <Feature Id="feaOpenAFS" AllowAdvertise="no" Absent="disallow" ConfigurableDirectory="AFSDIR"
             Description="$(loc.StrAFSProdDesc)" Display="expand" InstallDefault="local" Level="30"
             Title="OpenAFS">
            <ComponentRef Id="efl_desktop_INI" />
+
+  <?ifndef BinsOnly ?>
            <ComponentRef Id="efl_replace_afs_CMD" />
            <ComponentRef Id="efl_uninstall_EXE" />
 
@@ -12,7 +14,9 @@
            <ComponentRef Id="cmf_index2_HTM_en_US" />
            <ComponentRef Id="cmp_index_files_en_US" />
            <ComponentRef Id="cmp_logo_files_en_US" />
+  <?endif?>
 
+  <?ifndef BinsOnly ?>
             <Feature Id="feaClient" AllowAdvertise="no" Description="$(loc.StrAFSClientLongDesc)" Display="expand"
                 InstallDefault="followParent" Level="30" Title="$(loc.StrAFSClientDesc)">
                 
@@ -256,5 +260,56 @@
                 <ComponentRef Id="cmp_Lang_en_US" />
 		
             </Feature>
+  <?else?>
+            <Feature Id="feaBinaries" AllowAdvertise="no" Description="$(loc.StrBinsOnlyLongDesc)"
+                Display="expand" InstallDefault="followParent" Level="100" Title="$(loc.StrBinsOnlyDesc)">
+
+			<?ifdef DebugSyms?>
+				<Feature Id="feaClientDebug" AllowAdvertise="no" Description="$(loc.StrAFSClientDebugLongDesc)" Display="expand"
+					InstallDefault="$(var.DebugSymInstallDefault)" Level="$(var.DebugSymLowLevel)" Title="$(loc.StrAFSClientDebugDesc)">
+                    <ComponentRef Id="cmp_ClientProgramDebug" />
+                    <ComponentRef Id="cmp_CommonCommonDebug" />
+                    <?include runtime_debug.wxi?>
+				</Feature>
+			<?endif?>
+
+				<ComponentRef Id="cmp_CommonDir" />
+
+                <ComponentRef Id="cmf_afsrpc_DLL" />
+                <ComponentRef Id="cmf_afsauthent2_DLL" />
+                <ComponentRef Id="cmf_afspthread_DLL" />
+                <ComponentRef Id="cmf_TaAfsAppLib_DLL" />
+                <ComponentRef Id="cmf_afsprocmgmt_DLL" />
+
+                <ComponentRef Id="cmf_afsshare_EXE" />
+                <ComponentRef Id="cmf_libosi_DLL" />
+                <ComponentRef Id="cmf_libafsconf_DLL" />
+                <ComponentRef Id="cmf_klog_EXE" />
+                <ComponentRef Id="cmf_tokens_EXE" />
+                <ComponentRef Id="cmf_unlog_EXE" />
+                <ComponentRef Id="cmf_fs_EXE" />
+                <ComponentRef Id="cmf_afsdacl_EXE" />
+                <ComponentRef Id="cmf_symlink_EXE" />
+                <ComponentRef Id="cmf_kpasswd_EXE" />
+                <ComponentRef Id="cmf_pts_EXE" />
+                <ComponentRef Id="cmf_bos_EXE" />
+                <ComponentRef Id="cmf_kas_EXE" />
+                <ComponentRef Id="cmf_vos_EXE" />
+                <ComponentRef Id="cmf_udebug_EXE" />
+                <ComponentRef Id="cmf_translate_et_EXE" />
+                <ComponentRef Id="cmf_rxdebug_EXE" />
+                <ComponentRef Id="cmf_backup_EXE" />
+
+                <ComponentRef Id="rcm_BinsOnly_Parm" />
+                <?if $(env.CPU) = "i386"?>
+            	    <ComponentRef Id="cmf_aklog_EXE" />
+	 	<?endif?>
+                <ComponentRef Id="cmf_cmdebug_EXE" />
+                
+                <!-- Runtime -->
+                <?include runtime.wxi?>
+
+            </Feature>
+  <?endif?>
         </Feature>
 </Include>
diff --git a/src/WINNT/install/wix/files.wxi b/src/WINNT/install/wix/files.wxi
index 0bf67a4a61..4c99a6b577 100644
--- a/src/WINNT/install/wix/files.wxi
+++ b/src/WINNT/install/wix/files.wxi
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <Include>
+  <?ifndef BinsOnly?>
     <Directory Id="$(var.PISystemFolder)" SourceName="System">
         <Component Win64="$(var.Win64)" Id="cmf_afslogon_DLL" Guid="$(var.cmf_afslogon_DLL_guid)">
             <File Id="fileafslogon_DLL" Name="afslogon.dll" LongName="afslogon.dll" KeyPath="yes" DiskId="1" src="$(var.ClientDir)afslogon.dll" />
@@ -26,11 +27,13 @@
         </Component>
     <?endif?>
     </Directory>
+  <?endif?>
     <Directory Id="$(var.PIProgramFilesFolder)">
         <Directory Id="AFSDIR" Name="OpenAFS" SourceName=".">
 	    <Component Id="efl_desktop_INI" Guid="0ADB427F-3648-4BE0-983B-C454AA51895C">
 		<File Id="fildesktop_INI" Name="desktop.ini" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\install\wix\afsdesktop.ini" Hidden="yes" System="yes" />
 	    </Component>
+  <?ifndef BinsOnly?>
             <Component Id="efl_replace_afs_CMD" Guid="C9C93F3E-EEBA-4056-9669-5EF78D748D50">
                <File Id="filreplace_afs_CMD" Name="replafs.cmd" LongName="replace_afs.cmd" KeyPath="yes" DiskId="1" src="$(var.SrcDir)\WINNT\install\wix\replace_afs.cmd" />
             </Component>
@@ -39,11 +42,14 @@
 			<Shortcut Id="scUninstall" Directory="dirShortCut" Name="Uninst.lnk" LongName="Uninstall OpenAFS.lnk" Description="$(loc.StrUninstallDesc)" Icon="ico_OpenAFS" IconIndex="0" Show="normal" />
                 </File>
 	    </Component>
+  <?endif?>
             <Directory Id="dirCommon" Name="Common">
                 <Component Id="cmp_CommonDir" Guid="C86B03A1-AE97-48B1-A77B-1B2395F1E117" KeyPath="yes">
                     <Environment Id="envCommon" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Common" />
                     <CreateFolder />
                 </Component>
+
+  <?ifndef BinsOnly?>
                 <Component Win64="$(var.Win64)" Id="cmf_afsbosadmin_DLL" Guid="$(var.cmf_afsbosadmin_DLL_guid)">
                     <File Id="fileafsbosadmin_DLL" Name="afsbosad.dll" LongName="afsbosadmin.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsbosadmin.dll"/>
                 </Component>
@@ -65,6 +71,8 @@
                 <Component Win64="$(var.Win64)" Id="cmf_afsadminutil_DLL" Guid="$(var.cmf_afsadminutil_DLL_guid)">
                     <File Id="fileafsadminutil_DLL" Name="afsadmut.dll" LongName="afsadminutil.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsadminutil.dll"/>
                 </Component>
+  <?endif?>
+
                 <Component Win64="$(var.Win64)" Id="cmf_afsrpc_DLL" Guid="$(var.cmf_afsrpc_DLL_guid)">
                     <File Id="fileafsrpc_DLL" Name="afsrpc.dll" LongName="afsrpc.dll" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrpc.dll"/>
                 </Component>
@@ -80,11 +88,14 @@
                 <Component Win64="$(var.Win64)" Id="cmf_afsprocmgmt_DLL" Guid="$(var.cmf_afsprocmgmt_DLL_guid)">
                     <File Id="fileafsprocmgmt_DLL" Name="afsprcmg.dll" LongName="afsprocmgmt.dll" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsprocmgmt.dll"/>
                 </Component>
+  <?ifndef BinsOnly ?>
                 <Component Win64="$(var.Win64)" Id="cmf_afs_config_EXE" Guid="$(var.cmf_afs_config_EXE_guid)">
                     <File Id="fileafs_config_EXE" Name="afs_cfg.exe" LongName="afs_config.exe" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_config.exe"/>
                 </Component>
-                
+  <?endif?>
+
             <?ifdef DebugSyms?>
+              <?ifndef BinsOnly?>
                 <Component Win64="$(var.Win64)" Id="cmp_ServerCommonDebug" Guid="$(var.cmp_ServerCommonDebug_guid)">
                     <File Id="fileafsbosadmin_PDB" Name="afsbosad.pdb" LongName="afsbosadmin.pdb" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\afsbosadmin.pdb"/>
                     <File Id="fileafscfgadmin_PDB" Name="afscfgad.pdb" LongName="afscfgadmin.pdb" DiskId="1" src="$(var.ServerDir)\afscfgadmin.pdb"/>
@@ -94,6 +105,7 @@
                     <File Id="fileafsvosadmin_PDB" Name="afsvosad.pdb" LongName="afsvosadmin.pdb" DiskId="1" src="$(var.ServerDir)\afsvosadmin.pdb"/>
                     <File Id="fileafsadminutil_PDB" Name="afsadmut.pdb" LongName="afsadminutil.pdb" DiskId="1" src="$(var.ServerDir)\afsadminutil.pdb"/>
                 </Component>
+              <?endif?>
                 <Component Win64="$(var.Win64)" Id="cmp_CommonCommonDebug" Guid="$(var.cmp_CommonCommonDebug_guid)">
                     <File Id="fileafsrpc_PDB" Name="afsrpc.pdb" LongName="afsrpc.pdb" KeyPath="yes" DiskId="1" src="$(var.LibDir)\afsrpc.pdb"/>
                     <File Id="fileafsauthent_PDB" Name="afsauth.pdb" LongName="afsauthent.pdb" DiskId="1" src="$(var.LibDir)\afsauthent.pdb"/>
@@ -101,11 +113,14 @@
                     <File Id="fileTaAfsAppLib_PDB" Name="TaAfsApL.pdb" LongName="TaAfsAppLib.pdb" DiskId="1" src="$(var.ServerDir)\TaAfsAppLib.pdb"/>
                     <File Id="fileafsprocmgmt_PDB" Name="afsprcmg.pdb" LongName="afsprocmgmt.pdb" DiskId="1" src="$(var.ServerDir)\afsprocmgmt.pdb"/>
                 </Component>
+              <?ifndef BinsOnly ?>
                 <Component Win64="$(var.Win64)" Id="cmp_ClientCommonDebug" Guid="$(var.cmp_ClientCommonDebug_guid)">
                     <File Id="fileafs_config_PDB" Name="afs_cfg.pdb" LongName="afs_config.pdb" KeyPath="yes" DiskId="1" src="$(var.ClientDir)\afs_config.pdb"/>
                 </Component>
+              <?endif?>
             <?endif?>
 
+  <?ifndef BinsOnly ?>
                 <!-- <<LanguageSpecific:1033/en_US>> -->
             <?if $(var.Language) ="en_US"?>
                 <Component Win64="$(var.Win64)" Id="cmf_afseventmsg_1033_DLL" Guid="$(var.cmf_afseventmsg_1033_DLL_guid)">
@@ -162,6 +177,7 @@
                 </Directory>
             <?endif?>
                 <!-- <</LanguageSpecific:1033/en_US>> -->
+  <?endif?> <!-- /ifndef BinsOnly -->
 
                 <!-- Runtime libraries -->
           <?ifndef Debug?>
@@ -310,7 +326,8 @@
           <?endif?>
           <?endif?>
             </Directory> <!-- /common -->
-            
+
+  <?ifndef BinsOnly ?>            
             <Directory Id="dirControl_Center" Name="Contr" LongName="Control Center" SourceName="ControlC" LongSource="Control Center">
                 <Component Win64="$(var.Win64)" Id="cmf_TaAfsServerManager_EXE" Guid="$(var.cmf_TaAfsServerManager_EXE_guid)">
                     <File Id="fileTaAfsServerManager_EXE" Name="TaAfsSvM.exe" LongName="TaAfsServerManager.exe" KeyPath="yes" DiskId="1" src="$(var.ServerDir)\TaAfsServerManager.exe">
@@ -333,7 +350,9 @@
                 </Component>
             <?endif?>
             </Directory> <!-- /Control center -->
+  <?endif?>
 
+  <?ifndef BinsOnly?>
          <?if $(var.Language) = "en_US"?>
             <Component Id="efl_Readme_TXT_en_US" Guid="959DC63A-6C67-4B51-9F7D-2CDEE91F0099">
                 <File Id="fileREADME_TXT_en_US" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\en_US\README.txt"/>
@@ -381,7 +400,9 @@
                 <File Id="fileREADME_TXT_zh_CN" Name="README.txt" LongName="README.txt" DiskId="1" src="$(var.SrcDir)\WINNT\doc\install\Documentation\zh_CN\README.txt"/>
             </Component>
          <?endif?>
+  <?endif?>
 
+  <?ifndef BinsOnly?>
             <Directory Id="dirDocumentation" Name="Docum" LongName="Documentation" SourceName="Docs">
 				<!-- The following directory and everything below it is language dependent. -->
                     <Directory Id="dirHtml_$(var.Language)" Name="Html" src="$(var.SrcDir)\WINNT\doc\install\Documentation\$(var.Language)\html\">
@@ -774,8 +795,10 @@
                         </Directory> <!-- Release Notes -->
                     </Directory> <!-- Html -->
             </Directory> <!-- Documentation -->
+  <?endif?>
 
             <Directory Id="dirClient" Name="Client">
+  <?ifndef BinsOnly ?>
                 <Component Id="efl_CellServDB" Guid="8E69FDAB-08C5-4927-B1AA-57FCEEB065F2" NeverOverwrite="yes" Permanent="yes">
                     <File Id="file_CellServDB" Name="CelSrvDB" LongName="CellServDB" KeyPath="yes" DiskId="1" src="$(var.CellDbFile)"/>
                     <Condition>OLDCELLSERVDB = ""</Condition>
@@ -785,6 +808,7 @@
                     <CopyFile Id="copy_CellServDB" Delete="yes" DestinationDirectory="dirClient" DestinationName="CellServ|CellServDB" SourceDirectory="WindowsFolder" SourceName="afsdcell.ini" />
                     <Condition>OLDCELLSERVDB &lt;&gt; ""</Condition>
                 </Component>
+  <?endif?>
                 <Directory Id="dirProgram" Name="Program" src="$(var.ClientDir)">
                     <Component Win64="$(var.Win64)" Id="cmf_afsshare_EXE" Guid="$(var.cmf_afsshare_EXE_guid)">
                         <File Id="fileafsshare_EXE" Name="afsshare.exe" LongName="afsshare.exe" KeyPath="yes" DiskId="1" />
@@ -810,6 +834,7 @@
                     <Component Win64="$(var.Win64)" Id="cmf_afsdacl_EXE" Guid="$(var.cmf_afsdacl_EXE_guid)">
                         <File Id="fileafsdacl_EXE" Name="afsdacl.exe" KeyPath="yes" DiskId="1" />
                     </Component>
+  <?ifndef BinsOnly ?>
                     <Component Win64="$(var.Win64)" Id="cmf_afscreds_EXE" Guid="$(var.cmf_afscreds_EXE_guid)">
                         <File Id="fileafscreds_EXE" Name="afscreds.exe" LongName="afscreds.exe" KeyPath="yes" DiskId="1">
 							<Shortcut Id="scAfsCreds" Directory="dirShortCut" Name="Auth.lnk" LongName="Authentication.lnk" Description="$(loc.StrAfsCredsDesc)" Arguments="[CREDSAUTOINIT] [CREDSRENEWDRMAP] [CREDSIPCHDET] [CREDSQUIET] [CREDSSHOW]" Icon="ico_afscreds" IconIndex="0" Show="normal" WorkingDirectory="dirCommon" />
@@ -844,6 +869,7 @@
                         <Environment Id="envClient" Name="PATH" Action="create" System="yes" Permanent="no" Part="last" Separator=";" Value="[AFSDIR]Client\Program" />
                         <RemoveFile Id="removeCache" Directory="WindowsVolume" LongName="AFSCache" Name="AFSCache" On="uninstall" />
                     </Component>
+  <?endif?>
                      <Component Win64="$(var.Win64)" Id="cmf_symlink_EXE" Guid="$(var.cmf_symlink_EXE_guid)">
                         <File Id="filesymlink_EXE" Name="symlink.exe" LongName="symlink.exe" KeyPath="yes" DiskId="1" />
                     </Component>
@@ -882,10 +908,12 @@
                      <Component Win64="$(var.Win64)" Id="cmf_cmdebug_EXE" Guid="$(var.cmf_cmdebug_EXE_guid)">
                         <File Id="filecmdebug_EXE" Name="cmdebug.exe" LongName="cmdebug.exe" KeyPath="yes" DiskId="1" />
                     </Component>
+  <?ifndef BinsOnly?>
  		    <Component Win64="$(var.Win64)" Id="cmf_afs_cpa_CPL" Guid="$(var.cmf_afs_cpa_CPL_guid)">
 		    	<File Id="fileafs_cpa_CPL" Name="afs_cpa.cpl" LongName="afs_cpa.cpl" KeyPath="yes" DiskId="1"/>
 		    <Registry Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cpls" Name="AFS Client CPL" Type="string" Value="[#fileafs_cpa_CPL]" Id="reg_Full_Client11" />
 		    </Component>
+  <?endif?>
                 <?ifdef DebugSyms?>
                      <Component Win64="$(var.Win64)" Id="cmp_ClientProgramDebug" Guid="$(var.cmp_ClientProgramDebug_guid)">
                         <File Id="fileafsshare_PDB" Name="afsshare.pdb" LongName="afsshare.pdb" DiskId="1" />
@@ -895,9 +923,6 @@
                         <File Id="filetokens_PDB" Name="tokens.pdb" LongName="tokens.pdb" DiskId="1" />
                         <File Id="fileunlog_PDB" Name="unlog.pdb" LongName="unlog.pdb" DiskId="1" />
                         <File Id="filefs_PDB" Name="fs.pdb" LongName="fs.pdb" DiskId="1" />
-                        <File Id="fileafscreds_PDB" Name="afscreds.pdb" LongName="afscreds.pdb" DiskId="1" />
-                        <File Id="fileafs_shl_ext_PDB" Name="afsshext.pdb" LongName="afs_shl_ext.pdb" DiskId="1" />
-                        <File Id="fileafsd_service_PDB" Name="afsd_svc.pdb" LongName="afsd_service.pdb" DiskId="1" />
                         <File Id="filesymlink_PDB" Name="symlink.pdb" LongName="symlink.pdb" DiskId="1" />
                         <File Id="filekpasswd_PDB" Name="kpasswd.pdb" LongName="kpasswd.pdb" DiskId="1" src="$(var.BinDir)kpasswd.pdb" />
                         <File Id="filepts_PDB" Name="pts.pdb" LongName="pts.pdb" DiskId="1" src="$(var.BinDir)pts.pdb" />
@@ -912,10 +937,15 @@
                         	<File Id="fileaklog_PDB" Name="aklog.pdb" LongName="aklog.pdb" DiskId="1" />
 			<?endif?>
                         <File Id="filecmdebug_PDB" Name="cmdebug.pdb" LongName="cmdebug.pdb" DiskId="1" />
+  <?ifndef BinsOnly ?>
 			<File Id="fileafs_cpa_PDB" Name="afs_cpa.pdb" LongName="afs_cpa.pdb" KeyPath="yes" DiskId="1"/>
+                        <File Id="fileafscreds_PDB" Name="afscreds.pdb" LongName="afscreds.pdb" DiskId="1" />
+                        <File Id="fileafs_shl_ext_PDB" Name="afsshext.pdb" LongName="afs_shl_ext.pdb" DiskId="1" />
+                        <File Id="fileafsd_service_PDB" Name="afsd_svc.pdb" LongName="afsd_service.pdb" DiskId="1" />
+  <?endif?>
                     </Component>
                 <?endif?>
-                    
+  <?ifndef BinsOnly?>                  
                     <Directory Id="dirSample" Name="Sample">
                         <Component Id="cmp_SDK_Sample" Guid="F9373E95-F410-4AA5-AA79-07C11EE00334">
                             <File Id="filetoken_C" Name="token.c" LongName="token.c" KeyPath="yes" DiskId="1" src="$(var.SrcDir)WINNT\afsd\sample\token.c"/>
@@ -1232,8 +1262,10 @@
                             </Component>
                         </Directory>
                     </Directory>
+  <?endif?>
                 </Directory> <!-- /Program -->
             </Directory> <!-- /Client -->
+  <?ifndef BinsOnly ?>
             <Directory Id="dirServer" Name="Server">
                 <Directory Id="dirusr" Name="usr">
                     <Directory Id="dirafs" Name="afs">
@@ -1343,9 +1375,12 @@
                     </Directory>
                 </Directory>
             </Directory> <!-- Server -->
+  <?endif?>
 
         </Directory> <!-- AFS -->
     </Directory> <!-- program files -->
+
+  <?ifndef BinsOnly ?>
     <!-- References -->
     <Directory Id="ProgramMenuFolder" Name=".">
         <Directory Id="dirShortCut" Name="OpenAFS"/>
@@ -1353,6 +1388,7 @@
     <Directory Id="StartupFolder" Name="." />
     <Directory Id="WindowsVolume" Name="." />
     <Directory Id="WindowsFolder" Name="." />
+  <?endif?>
 
 	<!-- Shared assembly runtime for VS 2005 -->
 	<?if $(env.AFSVER_CL) = "1400"?>
diff --git a/src/WINNT/install/wix/lang/en_US/strings.wxl b/src/WINNT/install/wix/lang/en_US/strings.wxl
index 30303afd1a..72a2843a4e 100644
--- a/src/WINNT/install/wix/lang/en_US/strings.wxl
+++ b/src/WINNT/install/wix/lang/en_US/strings.wxl
@@ -25,6 +25,8 @@
     <String Id="StrAFSOptDesc">Optional components</String>
     <String Id="StrLoopbackDesc">Loopback adapter</String>
     <String Id="StrLoopbackLongDesc">Loopback adapter for AFS.  It is recommended that you install the loopback adapter if you are installing the client components.</String>
+    <String Id="StrBinsOnlyLongDesc">OpenAFS command-line utilities and libraries.</String>
+    <String Id="StrBinsOnlyDesc">Tools and libraries</String>
 
     <String Id="StrShlExtDesc">AFS Context Menu Shell Extension</String>
     <String Id="StrAfsCredsDesc">Authentication for AFS</String>
diff --git a/src/WINNT/install/wix/language_config.wxi b/src/WINNT/install/wix/language_config.wxi
index 95145c2ba2..338bf311e5 100644
--- a/src/WINNT/install/wix/language_config.wxi
+++ b/src/WINNT/install/wix/language_config.wxi
@@ -1,4 +1,4 @@
-<?xml version="1.0"?> 
+<?xml version="1.0"?> 
 <Include>
     <!-- This file defines localized strings and language configuration for the
          installer.  Please do not insert any localizable strings directly in any
@@ -16,18 +16,38 @@
     <?define LanguageCode="1033"?>
 
     <?define Manufacturer="OpenAFS.org"?>
-<?ifdef Debug?>
+<?ifdef BinsOnly?>
+  <?ifdef Debug?>
+    <?define PackageComments="OpenAFS for Windows (Tools and libraries) $(var.NumericVersion) CHECKED"?>
+    <?define ProductComments="OpenAFS for Windows (Tools and libraries) CHECKED build." ?>
+  <?else?>
+    <?define PackageComments="OpenAFS for Windows (Tools and libraries) $(var.NumericVersion)"?>
+    <?define ProductComments="OpenAFS for Windows. Tools and libraries."?>
+  <?endif?>
+<?else?>
+  <?ifdef Debug?>
     <?define PackageComments="OpenAFS for Windows $(var.NumericVersion) CHECKED"?>
     <?define ProductComments="OpenAFS for Windows. CHECKED build." ?>
-<?else?>
+  <?else?>
     <?define PackageComments="OpenAFS for Windows $(var.NumericVersion)"?>
     <?define ProductComments="OpenAFS for Windows. Client and server components for using AFS."?>
+  <?endif?>
 <?endif?>
+
     <?define Languages="$(var.LanguageCode)"?>
-<?if $(var.Platform) = "x64" ?>
-    <?define ProductName="OpenAFS for Windows (64-bit)"?>
+
+<?ifdef BinsOnly?>
+  <?if $(var.Platform) = "x64" ?>
+    <?define ProductName="OpenAFS for Windows (64-bit binaries)"?>
+  <?else?>
+    <?define ProductName="OpenAFS for Windows (32-bit binaries)"?>
+  <?endif?>
 <?else?>
+  <?if $(var.Platform) = "x64" ?>
+    <?define ProductName="OpenAFS for Windows (64-bit)"?>
+  <?else?>
     <?define ProductName="OpenAFS for Windows"?>
+  <?endif?>
 <?endif?>
     
     <!-- Localized packages should have different product codes -->
@@ -35,7 +55,8 @@
     <?ifndef ProductCode?>
         <?define ProductCode="????????-????-????-????-????????????"?>
     <?endif?>
-    
+
+<?ifndef BinsOnly?>    
     <!-- Same goes for localized components -->
     <?define DocHtmlIndexGuid="B656CA5A-5179-42D8-8972-2F128AEDE751"?>
     <?define DocHtmlGuid="C9595172-72DF-4F30-8C43-C16583CFB8B1"?>
@@ -46,7 +67,7 @@
     <?define DocHtmlRelnotesFilesGuid="D39E1662-F475-4D33-A6B5-CBC7B77891D0"?>
     <?define DocHtmlLogoFilesGuid="24E7F4AF-5D41-4D7B-B9DF-FA5787BAC787"?>
     <?define DocHtmlIndexFilesGuid="EEEA73B6-36CD-4471-BF5C-9317B90CA3CC"?>
-
+<?endif?>
 	<!-- other language specific strings are defined in the strings.wxl file -->	
 
     <!-- /(( en_US )) -->
diff --git a/src/WINNT/install/wix/platform.wxi b/src/WINNT/install/wix/platform.wxi
index 0d52cd320c..788456ec08 100644
--- a/src/WINNT/install/wix/platform.wxi
+++ b/src/WINNT/install/wix/platform.wxi
@@ -97,6 +97,7 @@
 	<?define cmf_upserver_EXE_guid="4201E9FE-56BC-4852-992A-18E5D75C3B39"?>
 	<?define cmf_afsserver_CPL_guid="7B0D1145-DB1B-47BA-A874-3AB26F86FFB6"?>
 	<?define cmp_Server_Program_Debug_guid="1EDCDA16-216B-434E-A06E-AD1A9D40F5A2"?>
+        <?define rcm_binsonly_parm_guid="A4969933-E01B-476C-B923-4F2EFBA2B78C"?>
 
 <?elseif $(var.Platform) = "Intel"?>
 	<?define PISystemFolder="SystemFolder"?>
@@ -194,6 +195,7 @@
 	<?define cmf_upserver_EXE_guid="3CBD2EF5-43BC-4CA2-B367-87E82DED1406"?>
 	<?define cmf_afsserver_CPL_guid="E270281E-9DB2-40A8-A418-55B4EC4A3FE7"?>
 	<?define cmp_Server_Program_Debug_guid="5F7BA9F7-E9BD-4AC3-9232-5EFBF6B740F8"?>
+        <?define rcm_binsonly_parm_guid="4DFE834A-F129-4FDD-91AD-8A31A849AF0B"?>
 
 <?else?>
 	<?error Unknown platform?>
diff --git a/src/WINNT/install/wix/property.wxi b/src/WINNT/install/wix/property.wxi
index beb75e80fd..1abe63e601 100644
--- a/src/WINNT/install/wix/property.wxi
+++ b/src/WINNT/install/wix/property.wxi
@@ -1,34 +1,37 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>
 <Include>
 
+    <Property Id="NETBIOSNAME">$(var.NetbiosName)</Property>
+    <Property Id="USEDNS">$(var.UseDNS)</Property>
     <Property Id="AFSCELLNAME">$(var.CellName)</Property>
+
+<?ifndef BinsOnly ?>
     <Property Id="LOGONOPTIONS">$(var.LogonOptions)</Property>
     <Property Id="FREELANCEMODE">$(var.FreelanceMode)</Property>
-    <Property Id="USEDNS">$(var.UseDNS)</Property>
-	<Property Id="NOFINDLANABYNAME">$(var.NoFindLanaByName)</Property>
-	<Property Id="MOUNTROOT">$(var.MountRoot)</Property>
-	<Property Id="NETBIOSNAME">$(var.NetbiosName)</Property>
-	<Property Id="RXMAXMTU">$(var.RxMaxMTU)</Property>
-	<Property Id="HIDEDOTFILES">$(var.HideDotFiles)</Property>
-	<Property Id="SECURITYLEVEL">$(var.SecurityLevel)</Property>
-	<Property Id="CREDSSTARTUP">1</Property>
-	<Property Id="CREDSAUTOINIT">-a</Property>
-	<Property Id="CREDSRENEWDRMAP">-m</Property>
-	<Property Id="CREDSIPCHDET">-n</Property>
-	<Property Id="CREDSQUIET">-q</Property>
-	<Property Id="SMBAUTHTYPE">$(var.SMBAuthType)</Property>
-	<!-- empty property 
-	<Property Id="CREDSSHOW"></Property>
-	-->
-	<!-- empty property
-	<Property Id="AFSCACHEPATH"></Property>
-	-->
-	<!-- empty property
-	<Property Id="AFSCACHESIZE"></Property>
-	-->
-	<!-- empty property
-	<Property Id="STOREANSIFILENAMES"></Property>
-	-->
+    <Property Id="NOFINDLANABYNAME">$(var.NoFindLanaByName)</Property>
+    <Property Id="MOUNTROOT">$(var.MountRoot)</Property>
+    <Property Id="RXMAXMTU">$(var.RxMaxMTU)</Property>
+    <Property Id="HIDEDOTFILES">$(var.HideDotFiles)</Property>
+    <Property Id="SECURITYLEVEL">$(var.SecurityLevel)</Property>
+    <Property Id="CREDSSTARTUP">1</Property>
+    <Property Id="CREDSAUTOINIT">-a</Property>
+    <Property Id="CREDSRENEWDRMAP">-m</Property>
+    <Property Id="CREDSIPCHDET">-n</Property>
+    <Property Id="CREDSQUIET">-q</Property>
+    <Property Id="SMBAUTHTYPE">$(var.SMBAuthType)</Property>
+    <!-- empty property 
+    <Property Id="CREDSSHOW"></Property>
+    -->
+    <!-- empty property
+    <Property Id="AFSCACHEPATH"></Property>
+    -->
+    <!-- empty property
+    <Property Id="AFSCACHESIZE"></Property>
+    -->
+    <!-- empty property
+    <Property Id="STOREANSIFILENAMES"></Property>
+    -->
+<?endif?>
 
     <!-- Add/remove programs -->
     <Property Id="ARPCOMMENTS">$(var.ProductComments)</Property>
@@ -44,6 +47,7 @@
     
     <Property Id="InstallMode">Typical</Property>
 
+<?ifndef BinsOnly?>
     <Property Id="AFSCCPATCH">
       <RegistrySearch Win64="$(var.Win64)" Id="rl_AFSCC_patch" Root="HKLM" Key="Software\TransarcCorporation\AFS Control Center\CurrentVersion" Name="PatchLevel" Type="registry" />
     </Property>
@@ -116,12 +120,14 @@
 	  <RegistrySearch Win64="$(var.Win64)" Id="rl_NSIS_Uninst" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenAFS" Name="UninstallString" Type="registry" />
     </Property>
     
-    <Property Id="ABORTREASON">$(loc.StrNsisAbortReason)</Property>
-    
     <Property Id="OLDCELLSERVDB">
       <DirectorySearch Id="dsOldCellServDB" Path="[WindowsFolder]" >
         <FileSearch Id="fsOldCellServDB" Name="afsdcell.ini" />
       </DirectorySearch>
     </Property>
 
+<?endif?>
+
+    <Property Id="ABORTREASON">$(loc.StrNsisAbortReason)</Property>
+    
 </Include>
diff --git a/src/WINNT/install/wix/registry.wxi b/src/WINNT/install/wix/registry.wxi
index d79b680708..d0a1a33557 100644
--- a/src/WINNT/install/wix/registry.wxi
+++ b/src/WINNT/install/wix/registry.wxi
@@ -3,6 +3,7 @@
     <!--
     This file will be included as a child of the root Directory tag.
     -->
+<?ifndef BinsOnly ?>
     <Component Id="rcm_Server" Guid="$(var.rcm_server_guid)" Win64="$(var.Win64)">
         <Registry Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\AFS Service" Action="createKeyAndRemoveKeyOnUninstall" Id="reg_Server"/>
         <Registry Root="HKLM" Key="SYSTEM\CurrentControlSet\Services\EventLog\Application\AFS Service" Id="reg_Server3"/>
@@ -204,5 +205,32 @@
     <Component Id="rcm_Loopback" Guid="$(var.rcm_loopback_guid)" Win64="$(var.Win64)">
         <Registry Root="HKLM" Key="SOFTWARE\OpenAFS\Client" Name="LoopbackInstalled" Type="integer" Value="1" Id="reg_Loopback1" KeyPath="yes" />
     </Component>
-    
+<?else?>
+    <Component Id="rcm_BinsOnly_Parm" Guid="$(var.rcm_client_guid)" Win64="$(var.Win64)">
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries" KeyPath="yes" Id="reg_Control_Center2" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries" Action="createKeyAndRemoveKeyOnUninstall" Id="reg_Control_Center" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Action="createKeyAndRemoveKeyOnUninstall" Id="reg_Control_Center3" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="MinorVersion" Type="integer" Value="$(var.VersionMinor)" Id="reg_Control_Center4" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Id="reg_Control_Center5" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="PatchLevel" Type="integer" Value="$(var.VersionPatch)" Id="reg_Control_Center6" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="MajorVersion" Type="integer" Value="$(var.VersionMajor)" Id="reg_Control_Center7" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="ReleaseType" Type="string" Value="$(var.ReleaseType)" Id="reg_Control_Center8" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="Software Type" Type="string" Value="File System" Id="reg_Control_Center9" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="PathName" Type="string" Value="[AFSDIR]Control Center" Id="reg_Control_Center10" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="VersionString" Type="string" Value="$(var.NumericVersion)" Id="reg_Control_Center11" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="InstallDateString" Type="string" Value="$(var.InstallTimestamp)" Id="reg_Control_Center13" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\CurrentVersion" Name="Description" Type="string" Value="$(loc.StrAFSCCDesc)" Id="reg_Control_Center14" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Action="createKeyAndRemoveKeyOnUninstall" Id="reg_Control_Center16" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="MinorVersion" Type="integer" Value="$(var.VersionMinor)" Id="reg_Control_Center17" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Id="reg_Control_Center18" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="PatchLevel" Type="integer" Value="$(var.VersionPatch)" Id="reg_Control_Center19" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="MajorVersion" Type="integer" Value="$(var.VersionMajor)" Id="reg_Control_Center20" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="ReleaseType" Type="string" Value="$(var.ReleaseType)" Id="reg_Control_Center21" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="Software Type" Type="string" Value="File System" Id="reg_Control_Center22" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="PathName" Type="string" Value="[AFSDIR]Control Center" Id="reg_Control_Center23" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="VersionString" Type="string" Value="$(var.NumericVersion)" Id="reg_Control_Center24" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="InstallDateString" Type="string" Value="$(var.InstallTimestamp)" Id="reg_Control_Center26" />
+        <Registry Root="HKLM" Key="SOFTWARE\TransarcCorporation\AFS Client 32-Bit Binaries\$(var.NumericVersion)" Name="Description" Type="string" Value="$(loc.StrAFSCCDesc)" Id="reg_Control_Center27" />
+    </Component>
+<?endif?>
 </Include>