diff --git a/src/site/xdoc/serversetup.xml b/src/site/xdoc/serversetup.xml
index ea481fd5..f9299793 100644
--- a/src/site/xdoc/serversetup.xml
+++ b/src/site/xdoc/serversetup.xml
@@ -29,34 +29,34 @@
             <p>Prepare a davmail.properties file according to you local needs :
             </p>
             <source>
-davmail.url=http://exchangeServer/exchange/
-davmail.popPort=1110
-davmail.imapPort=1143
-davmail.smtpPort=1025
-davmail.caldavPort=1080
-davmail.ldapPort=1389
-davmail.keepDelay=30
-davmail.sentKeepDelay=90
-davmail.caldavPastDelay=90
-davmail.enableProxy=false
-davmail.proxyHost=
-davmail.proxyPort=
-davmail.proxyUser=
-davmail.proxyPassword=
-davmail.ssl.keystoreType=JKS
-davmail.ssl.keyPass=
-davmail.ssl.keystoreFile=
-davmail.ssl.keystorePass=
-davmail.server=true
-davmail.server.certificate.hash=
-davmail.bindAddress=
-davmail.allowRemote=true
-davmail.disableUpdateCheck=false
-log4j.rootLogger=WARN
-log4j.logger.davmail=DEBUG
-log4j.logger.org.apache.commons.httpclient=WARN
-log4j.logger.httpclient.wire=WARN
-davmail.logFilePath=/var/log/davmail.log
+                davmail.url=http://exchangeServer/exchange/
+                davmail.popPort=1110
+                davmail.imapPort=1143
+                davmail.smtpPort=1025
+                davmail.caldavPort=1080
+                davmail.ldapPort=1389
+                davmail.keepDelay=30
+                davmail.sentKeepDelay=90
+                davmail.caldavPastDelay=90
+                davmail.enableProxy=false
+                davmail.proxyHost=
+                davmail.proxyPort=
+                davmail.proxyUser=
+                davmail.proxyPassword=
+                davmail.ssl.keystoreType=JKS
+                davmail.ssl.keyPass=
+                davmail.ssl.keystoreFile=
+                davmail.ssl.keystorePass=
+                davmail.server=true
+                davmail.server.certificate.hash=
+                davmail.bindAddress=
+                davmail.allowRemote=true
+                davmail.disableUpdateCheck=false
+                log4j.rootLogger=WARN
+                log4j.logger.davmail=DEBUG
+                log4j.logger.org.apache.commons.httpclient=WARN
+                log4j.logger.httpclient.wire=WARN
+                davmail.logFilePath=/var/log/davmail.log
             </source>
             <p>See
                 <a href="gettingstarted.html">Getting started</a>
@@ -73,6 +73,17 @@ davmail.logFilePath=/var/log/davmail.log
             </p>
         </section>
 
+        <section name="Register DavMail windows service">
+            <p>A new experimental davmailservice.exe wrapper is available in the windows
+                package.
+            </p>
+            <p>To register DavMail as a windows service, use:
+                <source>davmailservice install</source>
+                or
+                <source>sc create DavMail binPath= \path\to\davmailservice.exe type= own start= auto</source>
+            </p>
+        </section>
+
         <section name="DavMail Setup as a JEE Web Application">
             <p>Prerequisites : Sun J2SE 1.5 or 1.6 and any JEE compliant web container
             </p>