diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 000000000..e7857481f
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,62 @@
+---
+title: hledger Contributor List and Agreement
+---
+
+# hledger Contributors
+
+hledger is brought to you by:
+
+- Simon Michael - lead developer, project manager, general dogsbody
+- Sergey Astanin - utf8 support
+- Nick Ingolia - parser improvements
+- Roman Cheplyaka - "chart" command, "add" command improvements
+- Michael Snoyman - some additions to the Yesod web interface
+
+Developers who have not yet signed the contributor agreement:
+
+- Tim Docker - parser improvements
+- Marko Kocić - hlint cleanup
+- Oliver Braun - GHC 6.12 compatibility
+- Gwern Branwen - cleanups
+
+Also:
+
+- John Wiegley - created the original ledger program
+
+
+
+* * * * *
+
+
+
+# hledger Contributor Agreement
+
+This is the official contributor agreement (v1) and contributor list for
+the hledger project. If you have contributed non-trivial code changes to
+hledger, please sign this, to help ensure:
+
+1. that there is a clear legal status and audit trail for the project
+
+2. that you get proper credit for your work
+
+3. that we are able to remain license-compatible with related software
+ by updating to newer versions of our license when appropriate (eg
+ GPLv2 -\> GPLv3)
+
+To "sign", read the conditions below and then send a darcs patch to
+\`this file\`\_ adding your name to the Contributor List above. By so
+doing you promise that all of your commits to hledger:
+
+- are free of patent violations or copyright violations, to the best
+ of your knowledge
+
+- are released under the hledger project's
+ [license](http://joyful.com/repos/hledger/LICENSE); or are released
+ under another compatible license (in which case this must be clearly
+ noted); or are public domain
+
+- may be relicensed under official future versions of their license at
+ the discretion of the project leader
+
+We don't currently gather paper signatures, but this is a good start.
+Feel free to update your entry as your contributions grow!
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
deleted file mode 100644
index 83c02465a..000000000
--- a/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,72 +0,0 @@
----
-title: hledger Contributor List and Agreement
----
-Contributor List and Agreement
-======================================
-
-hledger Contributors
---------------------
-hledger is brought to you by:
-
-- Simon Michael - lead developer, project manager, general dogsbody
-- Sergey Astanin - utf8 support
-- Nick Ingolia - parser improvements
-- Roman Cheplyaka - "chart" command, "add" command improvements
-- Michael Snoyman - some additions to the Yesod web interface
-
-Developers who have not yet signed the contributor agreement:
-
-- Tim Docker - parser improvements
-- Marko Kocić - hlint cleanup
-- Oliver Braun - GHC 6.12 compatibility
-- Gwern Branwen - cleanups
-
-Also:
-
-- John Wiegley - created the original ledger program
-
-.. raw:: html
-
-
-
-----
-
-.. raw:: html
-
-
-
-hledger Contributor Agreement
------------------------------
-This is the official contributor agreement (v1) and contributor list
-for the hledger project. If you have contributed non-trivial code
-changes to hledger, please sign this, to help ensure:
-
-1. that there is a clear legal status and audit trail for the project
-
-2. that you get proper credit for your work
-
-3. that we are able to remain license-compatible with related software
- by updating to newer versions of our license when appropriate
- (eg GPLv2 -> GPLv3)
-
-To "sign", read the conditions below and then send a darcs patch to
-`this file`_ adding your name to the Contributor List above. By so
-doing you promise that all of your commits to hledger:
-
-- are free of patent violations or copyright violations, to the best of
- your knowledge
-
-- are released under the hledger project's license_; or are released
- under another compatible license (in which case this must be clearly
- noted); or are public domain
-
-- may be relicensed under official future versions of their license
- at the discretion of the project leader
-
-We don't currently gather paper signatures, but this is a good start.
-Feel free to update your entry as your contributions grow!
-
-
-.. _license: http://joyful.com/repos/hledger/LICENSE
-.. _this file: http://joyful.com//darcsweb/darcsweb.cgi?r=hledger;a=filehistory;f=/CONTRIBUTORS
-
diff --git a/DEVELOPMENT.markdown b/DEVELOPMENT.md
similarity index 100%
rename from DEVELOPMENT.markdown
rename to DEVELOPMENT.md
diff --git a/DOWNLOAD.markdown b/DOWNLOAD.md
similarity index 100%
rename from DOWNLOAD.markdown
rename to DOWNLOAD.md
diff --git a/MANUAL.markdown b/MANUAL.md
similarity index 100%
rename from MANUAL.markdown
rename to MANUAL.md
diff --git a/NEWS.markdown b/NEWS.md
similarity index 100%
rename from NEWS.markdown
rename to NEWS.md
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..63bbbf585
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+---
+title: hledger
+---
+
+# hledger
+
+hledger is a computer program for easily tracking money, time, or
+other commodities, using standard accounting principles. It is
+quite limited in features, but reliable. For some, it is a
+bare-bones, less complex, less expensive alternative to Quicken or
+Microsoft Money. hledger is available for free under the GNU
+General Public License.
+
+hledger aims to help both computer experts and every-day users gain
+clarity in their finances and time management. I use it every day
+to:
+
+- track spending and income
+- see time reports by day/week/month/project
+- get accurate numbers for client billing and tax filing
+- track invoices
+
+The [manual](MANUAL.html) and [screenshots](SCREENSHOTS.html) will
+explain more. There's also a [demo](http://demo.hledger.org) of
+hledger's web interface. To get started tracking your own numbers,
+[download](DOWNLOAD.html) a copy.
+
+For support and more technical info, see
+[development](DEVELOPMENT.html) or
+[email me](mailto:simon@joyful.com?subject=hledger:). I appreciate
+feedback on all aspects of hledger. Thanks!
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 548c83713..000000000
--- a/README.rst
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: hledger
----
-hledger
-=======
-
-hledger is a computer program for easily tracking money, time, or other
-commodities, using standard accounting principles. It is quite limited in
-features, but reliable. For some, it is a bare-bones, less complex, less
-expensive alternative to Quicken or Microsoft Money.
-hledger is available for free under the GNU General Public License.
-
-hledger aims to help both computer experts and every-day users gain clarity in their finances and time management.
-I use it every day to:
-
-- track spending and income
-- see time reports by day/week/month/project
-- get accurate numbers for client billing and tax filing
-- track invoices
-
-The manual_ and screenshots_ will explain more. There's also a demo_ of hledger's web interface.
-To get started tracking your own numbers, download_ a copy.
-
-For support and more technical info, see `development`_ or `email me`_.
-I appreciate feedback on all aspects of hledger. Thanks!
-
-
-.. _manual: MANUAL.html
-.. _screenshots: SCREENSHOTS.html
-.. _demo: http://demo.hledger.org
-.. _web interface: MANUAL.html#web
-.. _download: DOWNLOAD.html
-.. _development: DEVELOPMENT.html
-.. _email me: mailto:simon@joyful.com?subject=hledger:
diff --git a/SCREENSHOTS.markdown b/SCREENSHOTS.md
similarity index 100%
rename from SCREENSHOTS.markdown
rename to SCREENSHOTS.md
diff --git a/site/hakyll.hs b/site/hakyll.hs
index 7af9d44a3..0aa7e19f4 100644
--- a/site/hakyll.hs
+++ b/site/hakyll.hs
@@ -17,13 +17,13 @@ baseurl = "http://hledger.org"
main = hakyllWithConfiguration cfg $ do
mapM_ renderParentDirPage
- ["README.rst"
- ,"DOWNLOAD.markdown"
- ,"DEVELOPMENT.markdown"
- ,"NEWS.markdown"
- ,"SCREENSHOTS.markdown"
- ,"MANUAL.markdown"
- ,"CONTRIBUTORS.rst"
+ ["README.md"
+ ,"DOWNLOAD.md"
+ ,"DEVELOPMENT.md"
+ ,"NEWS.md"
+ ,"SCREENSHOTS.md"
+ ,"MANUAL.md"
+ ,"CONTRIBUTORS.md"
]
mapM_ static
["style.css"