diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index a635f6a15..0a328e948 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -126,6 +126,7 @@ $(OBJ)\heimdal-installer.wixobj: heimdal-installer.wxs
 	$(CANDLE) -arch $(PLATFORM) -o $@ $** \
 		-dVersion=$(VERSION)	\
 		-dBinDir=$(BINDIR)	\
+		-dDocDir=$(DOCDIR)	\
 		-dInstDir=$(INSTDIR)	\
 		-dSrcDir=$(SRC)		\
 		-dPlatform=$(PLATFORM)	\
diff --git a/packages/windows/installer/heimdal-installer.wxs b/packages/windows/installer/heimdal-installer.wxs
index 99ffb8835..05d157323 100644
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -147,6 +147,21 @@
             </Directory>
 
           </Directory>
+
+          <Directory Id='dirDoc' Name='doc' FileSource='$(var.DocDir)'>
+
+            <Component Id='comp.Heimdal.chm'
+                       Guid='785F6668-EBDB-4F18-8BEF-F72ECECB43D6'>
+              <File Name='heimdal.chm' />
+            </Component>
+
+            <Component Id='comp.HX509.chm'
+                       Guid='CBB379D6-629D-4EB9-AC0D-0167651F14EF'>
+              <File Name='hx509.chm' />
+            </Component>
+
+          </Directory>
+
         </Directory>
       </Directory>
       <Directory Id='CommonAppDataFolder' Name='ProgramData'>
@@ -185,6 +200,8 @@
       <ComponentRef Id='comp.kdigest' />
       <ComponentRef Id='comp.ktutil' />
       <ComponentRef Id='comp.krb5.conf' />
+      <ComponentRef Id='comp.Heimdal.chm' />
+      <ComponentRef Id='comp.HX509.chm' />
       <?ifdef LsaCache ?>
       <ComponentGroupRef Id='comps.LSACache' />
       <?endif?>