diff --git a/kpasswd/NTMakefile b/kpasswd/NTMakefile
index 9ed486a48..382ae083c 100644
--- a/kpasswd/NTMakefile
+++ b/kpasswd/NTMakefile
@@ -31,5 +31,21 @@
 
 RELDIR=kpasswd 
 
-!include ../windows/NTMakefile.w32 
+!include ../windows/NTMakefile.w32
 
+BINPROGRAMS=\
+	$(BINDIR)\kpasswd.exe
+
+KPASSWDLIBS=\
+	$(LIBROKEN)	\
+	$(LIBHEIMDAL)	\
+	$(LIBVERS)
+
+$(BINDIR)\kpasswd.exe: $(OBJ)\kpasswd.obj $(KPASSWDLIBS)
+	$(EXECONLINK)
+	$(EXEPREP)
+
+all:: $(BINPROGRAMS)
+
+clean::
+	-$(RM) $(BINPROGRAMS)
diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index a5cd5b765..1a542846f 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -13,6 +13,7 @@
   <?define GuidKdigest=D13DA4C0-B1BB-4C02-8ED2-5DFC7D16B19D ?>
   <?define GuidPolGSSAPI=2EB8472F-64DD-470B-AF65-FC8AAC185788 ?>
   <?define GuidPolKerberos=9ED6B62C-13D0-43BB-BCD7-4737D3E6EC43 ?>
+  <?define GuidKpasswd=20A984EC-5BCB-4B93-A3A9-7AACBDC625E9 ?>
 
   <?else?>
 
@@ -26,6 +27,7 @@
   <?define GuidKdigest=3FFBFAB0-FB37-411C-AF4E-53BCC468D7D1 ?>
   <?define GuidPolGSSAPI=7B7D6813-8D9C-4647-8966-89A1CA24A08B ?>
   <?define GuidPolKerberos=EF04F1AF-725B-4AF6-AE7B-18E2036C03B9 ?>
+  <?define GuidKpasswd=B66C04B5-EE1D-48C3-A25B-4DCAAA8F459B ?>
 
   <?endif?>
 
@@ -97,6 +99,13 @@
               <File Name='kdigest.pdb' />
             </Component>
 
+            <Component Id='comp.kpasswd'
+                       Guid='$(var.GuidKpasswd)'
+                       Win64='$(var.Win64)'>
+              <File Name='kpasswd.exe' KeyPath='yes' />
+              <File Name='kpasswd.pdb' />
+            </Component>
+
             <Merge Id='Heimdal.Assemblies' Language='0'
                    SourceFile='$(var.InstDir)\Heimdal.msm' />
 
@@ -287,6 +296,7 @@
       <ComponentRef Id='comp.kdigest' />
       <ComponentRef Id='comp.kinit' />
       <ComponentRef Id='comp.klist' />
+      <ComponentRef Id='comp.kpasswd' />
       <ComponentRef Id='comp.krb5.conf' />
       <ComponentRef Id='comp.krb5.conf.move' />
       <ComponentRef Id='comp.krb5.ini.move' />