diff --git a/README.asciidoc b/README.asciidoc
new file mode 100644
index 000000000..f07f16d97
--- /dev/null
+++ b/README.asciidoc
@@ -0,0 +1,67 @@
+= JBake
+Jonathan Bullock
+2013-10-20
+:idprefix:
+
+http://jbake.org[JBake] is a Java based open source static site/blog generator for developers.
+
+image::https://travis-ci.org/jonbullock/JBake.png?branch=master[Build Status, link="https://travis-ci.org/jonbullock/JBake"]
+
+== Documentation
+
+Full documentation is available on http://jbake.org/docs/[jbake.org].
+
+== Maven
+
+You can run directly from the source code using the Maven exec plugin:
+
+----
+mvn exec:java -Dexec.mainClass=org.jbake.launcher.Main -Dexec.args="/fromFolder /tmp/toFolder/"
+----
+
+== Contributing
+
+Coming soon...
+
+== Versioning
+
+The project has adopted the http://semver.org[Semantic Versioning] spec from v2.2.0 onwards to maintain an 
+understandable backwards compatibility strategy.
+
+The version format is as follows:
+
+----
+<major>.<minor>.<patch>-<label>
+----
+
+* An increment of the major version represents incompatible API changes.
+* An increment of the minor version represents additional functionality in a backwards-compatible manner.
+* An increment of the patch version represents backwards-compatible bug fixes.
+* Existence of a label represents a pre-release or build metadata.
+
+== Community
+
+Talk to the developers behind JBake:
+
+* http://groups.google.com/group/jbake-dev[Mailing list]
+* irc://irc.freenode.net/#jbake[IRC - #jbake on Freenode]
+
+Talk to other users of JBake on the forum:
+
+* http://groups.google.com/group/jbake-user[Forum]
+
+== Tools & Libraries Used
+
+* http://commons.apache.org/[Apache Commons IO, Configuration, Lang & Logging]
+* http://maven.apache.org/[Apache Maven]
+* http://args4j.kohsuke.org/[Args4j]
+* http://asciidoctor.org/[Asciidoctor]
+* http://www.eclipse.org/[Eclipse IDE]
+* http://freemarker.org/[Freemarker]
+* http://junit.org/[JUnit]
+* http://markdownj.org/[MarkdownJ]
+* http://www.eclipse.org/jetty/[Jetty Server]
+
+== Copyright & License
+
+Licensed under the MIT License, see the LICENSE file.
\ No newline at end of file
diff --git a/README.md b/README.md
deleted file mode 100644
index c8164aa06..000000000
--- a/README.md
+++ /dev/null
@@ -1,193 +0,0 @@
-# JBake
-
-[![Build Status](https://travis-ci.org/jonbullock/JBake.png?branch=master)](https://travis-ci.org/jonbullock/JBake)
-
-by **[Jonathan Bullock](http://jonathanbullock.com/)**
-
-JBake is a Java based open source static site/blog generator for developers, bake your own web site!
-
-## Features
-
-- Supports both HTML & Markdown content
-- Allows you to structure your content any way you see fit
-- Blog aware (RSS feed, tags, archive)
-- Customisable templates
-- Scripting support in templates via Freemarker
-- Supports custom meta data that is exposed to templates
-- Features are configurable
-- Store your site in Dropbox, CVS, SVN, Git whatever you want
-
-## Getting Started
-
-- Get the source code
-- To start developing JBake run `mvn eclipse:eclipse` to build required Eclipse project files
-- To start using JBake run `mvn package` from the root folder to build a release distribution
-
-## Usage
-
-- Run `jbake` or `jbake.bat` (if you are on Windows) to do some baking, this will assume the current folder as the source and place any output into an `output` folder in the current folder
-- Alternatively run `jbake <source_folder> <destination_folder>` if you want full control over the source and destination folders
-
-## Run from maven
-
-You can run directly from sources using the maven exec plugin:
-
-```
-mvn exec:java -Dexec.mainClass=org.jbake.launcher.Main -Dexec.args="/fromFolder /tmp/toFolder/"
-```
-
-## Source structure
-
-Here is an example source folder structure:
-
-<pre>
-.
-|-- assets
-|   |-- favicon.gif
-|   |-- robots.txt
-|   |-- css
-|       |-- style.css
-|-- content
-|   |-- about.html
-|   |-- 2013
-|       |-- 02 
-|           |-- weekly-links-1.html
-|           |-- weekly-links-2.md
-|-- templates
-|   |-- index.ftl
-|   |-- page.ftl
-|   |-- post.ftl
-|   |-- feed.ftl
-|-- custom.properties
-</pre>
-
-A full example source folder is provided with the [source code](https://github.com/jonbullock/JBake/tree/master/src/test/resources).
-
-Both [http://jonathanbullock.com](http://jonathanbullock.com) and [http://jbake.org](http://jbake.org) are built using JBake.
-
-### Assets
-
-Place your static files in this folder and they will be copied to the root of the destination folder. Any folder structure you create will be maintained.
-
-### Content
-
-Place your dynamic content in this folder, the content in the files in this folder will be "mixed" with the templates to generate your site. Again any folder structure you create will be maintained in the destination folder.
-
-The extension of the file determines what content it contains:
-
-- .html = HTML content
-- .md = Markdown content
-
-#### Header
-
-Each content file needs to have a meta-data header in it:
-
-<pre>
-title=Weekly Links #2
-date=2013-02-01
-type=post
-tags=weekly links, java
-status=published
-~~~~~~
-</pre>
-
-The header MUST have at least the **status** & **type** fields, the rest are optional.
-
-##### Status
-
-You have 2 options for the status field: `draft` and `published`, drafts are rendered along with published posts however they are given a "-draft" suffix, for example `first-post-draft.html`.
-
-##### Type
-
-You can choose what template your content file will be "mixed" with by changing the type field (i.e. type=post will use post.ftl, type=page will use page.ftl).
-
-#### Extra Header
-
-You can also add extra meta data in the header that is also exposed to the templates:
-
-<pre>
-summary=This is a summary of the larger post
-</pre>
-
-And access it from the template like so:
-
-`<p>${content.summary}</p>`
-
-### Templates
-
-This is the folder where your [Freemarker](http://freemarker.sourceforge.net) templates go. For more information on what you can do in Freemarker templates see the [Manual](http://freemarker.sourceforge.net/docs/index.html).
-
-Here is the data that is available to you in your template files:
-
-#### Global
-
-This data is available to all templates regardless.
-
-- `${version}` = version of JBake
-- `${config.[options]}` = map of configuration data
-
-All the configuration options in `default.properties` are available with any `.` in the property being replaced with `_`.
-For example `template.index.file=index.ftl` is available via `${config.template_index_file}`.
-
-- `${posts}` = collection of all posts (files that don't have `type=page`)
-- `${pages}` = collection of all pages (files that have `type=page`)
-
-You can loop through the above collections using:
-
-<pre>
-&lt;#list posts as post&gt;
-	..
-&lt;/#list&gt;
-</pre>
-
-Within the loop you can then access the options for each post or page: `${post.[options]}` or `${page.[options]}`
-
-All of the header fields are available such as `${post.title}` and the body of the file is available via `${post.body}`.
-
-#### Page / Post
-
-These templates (page.ftl & post.ftl) as well as any custom templates you create yourself have the following data available to them:
-
-- `${content.[options]}` = map of file contents
-
-All of the header fields are available such as `${content.title}` and the body of the file is available via `${content.body}`.
-
-#### Index / Feed / Archive
-
-These templates (index.ftl, feed.ftl & archive.ftl) have the following extra data available to them:
-
-- `${published_posts}` = collection of published posts
-- `${published_date}` = date when file is generated (only available to Feed)
-
-#### Tags
-
-This template (tags.ftl) has the following extra data available to it:
-
-- `${tag}` = tag being rendered
-- `${tag_posts}` = collection posts for tag
-
-## Configuration
-
-The `custom.properties` file allows you to override the default configuration of JBake. You can change the name of the folder that stores your content or templates, decide whether to generate a an RSS feed or not. See [default.properties](https://github.com/jonbullock/JBake/blob/master/src/main/resources/default.properties) for what options are available.
-
-## License
-
-Licensed under the MIT License, see the LICENSE file.
-
-## Development Tools
-
-- Java v1.6 SDK
-- Eclipse Juno (Java EE Package)
-- Apache Maven v3.0.3
-
-## Alternatives
-
-- [Jekyll - Ruby](http://jekyllrb.com/)
-- [Awestruct - Ruby](http://awestruct.org/)
-- [Usermesh - Perl](http://usermesh.org/)
-
-## Contact
-
-- [http://jonathanbullock.com/](http://jonathanbullock.com/)
-- [jonbullock@gmail.com](mailto:jonbullock@gmail.com)
-- [@jonbullock](http://twitter.com/jonbullock)