diff --git a/Guardfile b/Guardfile
index f42889b4..33024ef9 100644
--- a/Guardfile
+++ b/Guardfile
@@ -5,7 +5,7 @@ options = {:mkdirs => true, :safe => :unsafe, :attributes => 'linkcss'}
 
 guard 'shell' do
   watch(/^[A-Za-z].*\.adoc$/) {|m|
-    Asciidoctor.render_file('src/main/adoc/README.adoc', options.merge(:to_dir => '.'))
+    Asciidoctor.render_file('src/main/adoc/README.adoc', options.merge(:to_file => './README.md'))
     Asciidoctor.render_file('src/main/adoc/spring-cloud-config.adoc', options.merge(:to_dir => 'target/docs'))
   }
 end
diff --git a/README.html b/README.md
similarity index 98%
rename from README.html
rename to README.md
index fd82b1cf..81825ed6 100644
--- a/README.html
+++ b/README.md
@@ -61,7 +61,7 @@ Spring configuration.</p>
 <div class="ulist">
 <ul>
 <li>
-<p>Bind to Config Server and initialize Spring <code>Environment</code> with remote property sources</p>
+<p>Bind to the Config Server and initialize Spring <code>Environment</code> with remote property sources</p>
 </li>
 <li>
 <p>Encrypt and decrypt property values (symmetric or asymmetric)</p>
@@ -226,7 +226,7 @@ baz</pre>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2014-09-26 11:20:05 BST
+Last updated 2014-09-26 11:35:20 BST
 </div>
 </div>
 </body>
diff --git a/src/main/adoc/README.adoc b/src/main/adoc/README.adoc
index 280e6fc4..afefb121 100644
--- a/src/main/adoc/README.adoc
+++ b/src/main/adoc/README.adoc
@@ -12,7 +12,7 @@ Spring Cloud Config Server features:
 
 Config Client features (for Spring applications):
 
-* Bind to Config Server and initialize Spring `Environment` with remote property sources
+* Bind to the Config Server and initialize Spring `Environment` with remote property sources
 * Encrypt and decrypt property values (symmetric or asymmetric)
 * `@RefreshScope` for Spring `@Beans` that want to be re-initialized when configuration changes
 * Management endpoints:
diff --git a/src/main/adoc/spring-cloud-config.adoc b/src/main/adoc/spring-cloud-config.adoc
index 04b2e5d4..5a6c6e4d 100644
--- a/src/main/adoc/spring-cloud-config.adoc
+++ b/src/main/adoc/spring-cloud-config.adoc
@@ -1,4 +1,5 @@
 = Spring Cloud Config
+:toc:
 
 include::intro.adoc[]