diff --git a/contrib/win32/mercurial.ico b/contrib/win32/mercurial.ico
new file mode 100644
index 0000000000000000000000000000000000000000..046808d5433afcada610e3ac8c26c726a184ba04
GIT binary patch
literal 2238
zc%1E&c}$ac7{|YCgSm@=Y;rk{ZH$hwaZJb91jHR|OkpoAR}0dX;)<d|SxdQECfl$D
zu@)Fmpe-xqY+n^rj(9-467MKpF&a&bcT`X@p4r<L5ou!FU;Ag@H^02k^ZPu{FVF7;
zY^cx63ud)X17=Wv8r4i)bE#&7X?UJ&Y;0g_YYRI&JJ{RX!@<D;PEJm6c6Nq~iwoS{
z-QnTk0Z&g)czb)p$Hxc0zP_N*Xz=s%gTKE&0s;aM7#N74pdbVX2O}gT1fij!2n!2C
zcz8G>A|enO8HuQ<C`3m`BPJ#Wv9Ylr2m*9E9SjBoiHV6wN=gEg$pnkVLTYL%($dnv
z;c&p^a*>{%4jzw(jEoHM`Fvz%W+E#q3)$J(5C{aw&CP{SD1=BTf=DESSS&_CK>-R2
z3sF>5gyQ02NF)+SB~nPGQk0aGptQ6UvXwH(WHQKQa>(U!l$V#IqM`zom6cGeRzRUp
zK)FT<rBaEiswz}hSEHt;2DP=dsH>|(eSJMtDis<U8qnC-h^D3{sMTs{)Ea0s8fdjz
zG&eUxr_-UOr3HGu9<8mdXlrdlTU#62+uPC6(Sgp+PIPs3!C)}JXf%Q(NvvJF7VFln
z!}|5>(cRsRp6(v>^z>lEh7H)baU(Wu+JxTTUi9_#p}(&m{r&wI7#P6j&6}}h%NA_i
zx)s~DZNuQ;Ach8qFf=rT?c29w$BrG?xpOCW?b?OiyLV&Ho;}#RcQ5ws+lT%8_v65U
z12}l_APyZmgu{mq<H(UC7#<$R(W6Ik?AS3JKYko1PMpBWlP7WN)G3@keHv%ZoWa?%
zXL0V_Ih;R#9v3cLz{QIfap}?}T)uo6SFT*a)vH%=?b<b5zkVGzZrs4ln>R5sGJ?^O
zQH+j`;?}KOxPALJ?%cV9v9U4S9lMKr_wM2T{rh<E-~k>!e27Pn9^vuh$Im^}|Les>
z{#!Nv=<YWA_pWC<^-E`m7j~K~-Q4M(k`;?Sub7Ni&V2hF+N=;YWtNCs-+J|B*Hm`A
zaRRGiVmadcxWHg))N(ODn@<n4bIqAQ5y0dS#A;oA=Ep*k)Cw21=u}ds;~UEopYR{z
zs8?ihy>gxx<>V$eQFp8=)!rfDk8vJPn8Z~te3NqO*f}~XU=3mG`*pj8XEDqH#i^!z
zV<sWeQUSkxg>Qeh@CKfl6Z54ePtGJ#@}#O}zU%9Aw3YyQiV4RTnJaGMo1EmD>X?^&
z+2a*dE#WNWl^M*oMqnO{*^u|%YjZos0}T3>&T&&FPBI5%*DkQ}s<&Ey{TE`ErJO2>
z<Mez|&-$k9DK!+)KFqV^6U&qVuf(eST>|{(S)g$>;hmKI$#M%O;_3(l|CB;sC7~%y
zxb&krUxvDQuo>f=_)}o}StP;G>I4ZS*%jve?)3K~*i2$VIlns2%Ag9Z<grOZ&@`t7
zTm~^&$-lVF*O}tEdNR$?XEB|aB9?mrsmVzfwvc~+FmuUNN)YTB4W_cGmhWnvO%RLR
z4CC{Tir`seV!?M$)+IVG*%~MNXr6Gsm|@N1BPQ0hEI-LQ{Zst}Z_VRQ#c|)4PTDqw
zFm4K`^CoYramBOqr!OsecHfO<%M+ermY~+^WT+*JQ_QnS;4EL&X@x1Z{Uys62#PBk
LpI+bp`u+I_G)EG_

diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -22,7 +22,7 @@ VersionInfoCopyright=Copyright 2005-2008
 VersionInfoCompany=Matt Mackall and others
 InternalCompressLevel=max
 SolidCompression=true
-SetupIconFile=contrib\favicon.ico
+SetupIconFile=contrib\win32\mercurial.ico
 AllowNoIcons=true
 DefaultGroupName=Mercurial
 PrivilegesRequired=none
diff --git a/contrib/win32/win32-build.txt b/contrib/win32/win32-build.txt
--- a/contrib/win32/win32-build.txt
+++ b/contrib/win32/win32-build.txt
@@ -27,6 +27,9 @@ It has the following prerequisites, at l
   add_path (you need only add_path.exe in the zip file)
       http://www.barisione.org/apps.html#add_path
 
+  Asciidoc - optional
+      http://www.methods.co.nz/asciidoc/
+
 And, of course, Mercurial itself.
 
 Once you have all this installed and built, clone a copy of the
@@ -51,6 +54,14 @@ you can skip the first build step.
 
 Copy mfc71.dll and add_path.exe into the dist directory that just got created.
 
+Before building the installer, you have to build Mercurial HTML documentation 
+(or fix mercurial.iss to not reference the doc directory). Assuming you have an
+"asciidoc.bat" batch file somewhere in your PATH:
+
+  cd doc
+  mingw32-make ASCIIDOC=asciidoc.bat html
+  cd ..
+
 If you use ISTool, you open the C:\hg\hg-release\contrib\win32\mercurial.iss
 file and type Ctrl-F9 to compile the installer file.
 
@@ -66,6 +77,9 @@ following:
   echo [build] > setup.cfg
   echo compiler=mingw32 >> setup.cfg
   python setup.py py2exe -b 1
+  cd doc
+  mingw32-make ASCIIDOC=asciidoc.bat html
+  cd ..
   iscc contrib\win32\mercurial.iss
 
 and run it from the root of the hg repository (c:\hg\hg-release).
diff --git a/doc/Makefile b/doc/Makefile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -5,6 +5,7 @@ PREFIX=/usr/local
 MANDIR=$(PREFIX)/share/man
 INSTALL=install -c
 PYTHON=python
+ASCIIDOC=asciidoc
 
 all: man html
 
@@ -24,10 +25,10 @@ hg.1.gendoc.txt: ../mercurial/commands.p
 	mv $*~ $*
 
 %.xml: %.txt
-	asciidoc -d manpage -b docbook $*.txt
+	$(ASCIIDOC) -d manpage -b docbook $*.txt
 
 %.html: %.txt
-	asciidoc -b html4 $*.txt || asciidoc -b html $*.txt
+	$(ASCIIDOC) -b html4 $*.txt || $(ASCIIDOC) -b html $*.txt
 
 MANIFEST: man html
 	# tracked files are already in the main MANIFEST