diff --git a/CHANGES.txt b/CHANGES.txt
index aad1adcec2f..f97fef1f9f2 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -174,6 +174,8 @@ Release 0.21.0 - Unreleased
    HBASE-1829  Make use of start/stop row in TableInputFormat
                (Lars George via Stack)
    HBASE-1867  Tool to regenerate an hbase table from the data files
+   HBASE-1904  Add tutorilal for installing HBase on Windows using Cygwin as
+               a test and development environment (Wim Van Leuven via Stack)
 
   OPTIMIZATIONS
    HBASE-410   [testing] Speed up the test suite
diff --git a/src/docs/src/documentation/content/xdocs/site.xml b/src/docs/src/documentation/content/xdocs/site.xml
index ec221804222..46caa206926 100644
--- a/src/docs/src/documentation/content/xdocs/site.xml
+++ b/src/docs/src/documentation/content/xdocs/site.xml
@@ -36,6 +36,7 @@ See http://forrest.apache.org/docs/linking.html for more info.
     <started   label="Getting Started"    href="ext:api/started" />
     <api       label="API Docs"           href="ext:api/index" />
     <api       label="HBase Metrics"      href="metrics.html" />
+    <api       label="HBase on Windows"   href="cygwin.html" />
     <wiki      label="Wiki"               href="ext:wiki" />
     <faq       label="FAQ"                href="ext:faq" />
     <lists     label="Mailing Lists"      href="ext:lists" />
diff --git a/src/docs/src/documentation/content/xdocs/tabs.xml b/src/docs/src/documentation/content/xdocs/tabs.xml
index ac6ccb4b2b2..5af2a23142c 100644
--- a/src/docs/src/documentation/content/xdocs/tabs.xml
+++ b/src/docs/src/documentation/content/xdocs/tabs.xml
@@ -32,5 +32,4 @@
   <tab label="Project" href="http://hadoop.apache.org/hbase/" />
   <tab label="Wiki" href="http://wiki.apache.org/hadoop/Hbase" />
   <tab label="HBase Documentation" dir="" />  
-  
 </tabs>
diff --git a/src/java/overview.html b/src/java/overview.html
index d6e11a8713e..1933cb45fe3 100644
--- a/src/java/overview.html
+++ b/src/java/overview.html
@@ -103,22 +103,12 @@
 </ul>
 
 <h3><a name="windows">Windows</a></h3>
-<p>If you are running HBase on Windows, you must install <a href="http://cygwin.com/">Cygwin</a>.
-Additionally, it is <em>strongly recommended</em> that you add or append to the following
-environment variables. If you install Cygwin in a location that is not <code>C:\cygwin</code> you
-should modify the following appropriately.</p>
-
-<blockquote>
-<pre>
-HOME=c:\cygwin\home\jim
-ANT_HOME=(wherever you installed ant)
-JAVA_HOME=(wherever you installed java) 
-PATH=C:\cygwin\bin;%JAVA_HOME%\bin;%ANT_HOME%\bin; other windows stuff 
-SHELL=/bin/bash
-</pre>
-</blockquote>
-
-<p>For additional information, see the <a href="http://hadoop.apache.org/common/docs/current/quickstart.html">Hadoop Quick Start Guide</a></p>
+If you are running HBase on Windows, you must install
+<a href="http://cygwin.com/">Cygwin</a>
+to have a *nix-like environment for the shell scripts. The full details
+are explained in 
+the <a href="../cygwin.html">Windows Installation</a>
+guide.
 
 
 <h2><a name="getting_started" >Getting Started</a></h2>