diff --git a/CHANGELOG b/CHANGELOG
deleted file mode 100644
index 7bcec62..0000000
--- a/CHANGELOG
+++ /dev/null
@@ -1,12 +0,0 @@
-NEXT
-Multiline and literal strings.
-Pass TOML validator (https://github.com/BurntSushi/toml-test), which uncovered many bugs.
-Key names can contain dots.
-Reduced visibility of internal classes, so that only Toml class is visible to users.
-Split parsing into several stages, to make it simpler to understand.
-
-0.2
-Support for TOML 0.2 spec, most notably table arrays.
-
-0.1
-Support for TOML 0.1 spec.
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..916d20b
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# toml4j Changelog
+
+## 0.3.1 / 2014-12-16
+* Support for [TOML 0.3.1](https://github.com/toml-lang/toml/tree/v0.3.1) spec
+* Pass TOML validator (https://github.com/BurntSushi/toml-test), which uncovered many bugs.
+* Reduced visibility of internal classes, so that only Toml class is visible to users.
+* Refactored parsing into several steps.
+
+## 0.2 / 2014-04-10
+* Support for [TOML 0.2](https://github.com/toml-lang/toml/tree/v0.2.0) spec, most notably table arrays.
+
+## 0.1 / 2014-04-06
+* Support for [TOML 0.1](https://github.com/toml-lang/toml/tree/v0.1.0) spec.
diff --git a/README.md b/README.md
index bae6891..7a5bcb4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # toml4j
 
-toml4j is a [TOML 0.2.0](https://github.com/mojombo/toml/tree/v0.2.0) parser for Java that uses the [Parboiled](http://www.parboiled.org) PEG parser.
+toml4j is a [TOML 0.3.1](https://github.com/toml-lang/toml/tree/v0.3.1) parser for Java that uses the [Parboiled](http://www.parboiled.org) PEG parser.
 
 [![Build Status](https://travis-ci.org/mwanji/toml4j.svg?branch=wip)](https://travis-ci.org/mwanji/toml4j) [![Coverage Status](https://img.shields.io/coveralls/mwanji/toml4j.svg)](https://coveralls.io/r/mwanji/toml4j?branch=wip)
 
@@ -77,6 +77,7 @@ All TOML primitives can be mapped, as well as a number of Java-specific types:
 * A TOML Number can be converted to any primitive type (or the wrapper equivalent), `BigInteger` or `BigDecimal`
 * A TOML string can be converted to a `String`, enum, `java.net.URI` or `java.net.URL`
 * A single-letter TOML string can be converted to a `char` or `Character`
+* Multiline and literal TOML strings can be converted to `String`
 * A TOML array can be converted to a `List`, `Set` or array. The generic type can be anything that can be converted.
 * A TOML table can be converted to a custom class or to a `Map<String, Object>`. The generic type of the value can be anything that can be converted.
 
@@ -97,7 +98,7 @@ Use the getters to retrieve the data:
 
 You can also navigate values within a table with a compound key of the form `table.key`. Use a zero-based index such as `tableArray[0].key` to navigate table arrays.
 
-Non-existant keys return null.
+Non-existent keys return null.
 
 ````
 title = "TOML Example"