diff --git a/Makefile b/Makefile
index 58fe8d80..3f08079e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=0.1.9
+VERSION=0.2.0
 
 all: deps fmt combined
 
diff --git a/README.md b/README.md
index 381a4265..1599ccfb 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-MailHog [ ![Download](https://img.shields.io/github/release/mailhog/MailHog.svg) ](https://github.com/mailhog/MailHog/releases/tag/v0.1.9) [![GoDoc](https://godoc.org/github.com/mailhog/MailHog?status.svg)](https://godoc.org/github.com/mailhog/MailHog) [![Build Status](https://travis-ci.org/mailhog/MailHog.svg?branch=master)](https://travis-ci.org/mailhog/MailHog)
+MailHog [ ![Download](https://img.shields.io/github/release/mailhog/MailHog.svg) ](https://github.com/mailhog/MailHog/releases/tag/v0.2.0) [![GoDoc](https://godoc.org/github.com/mailhog/MailHog?status.svg)](https://godoc.org/github.com/mailhog/MailHog) [![Build Status](https://travis-ci.org/mailhog/MailHog.svg?branch=master)](https://travis-ci.org/mailhog/MailHog)
 =========
 
 Inspired by [MailCatcher](http://mailcatcher.me/), easier to install.
@@ -45,7 +45,7 @@ MailHog is an email testing tool for developers:
 * Multipart MIME support
 * Download individual MIME parts
 * In-memory message storage
-* MongoDB storage for message persistence
+* MongoDB and file based storage for message persistence
 * Lightweight and portable
 * No installation required
 
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index 5c81fd06..69723167 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -9,13 +9,14 @@ You can configure MailHog using command line options or environment variables:
 | MH_HOSTNAME         | -hostname       | mailhog.example | Hostname to use for EHLO/HELO and message IDs
 | MH_API_BIND_ADDR    | -api-bind-addr  | 0.0.0.0:8025    | Interface and port for HTTP UI server to bind to
 | MH_UI_BIND_ADDR     | -ui-bind-addr   | 0.0.0.0:8025    | Interface and port for HTTP API server to bind to
+| MH_MAILDIR_PATH     | -maildir-path   |                 | Maildir path (for maildir storage backend)
 | MH_MONGO_COLLECTION | -mongo-coll     | messages        | MongoDB collection name for message storage
 | MH_MONGO_DB         | -mongo-db       | mailhog         | MongoDB database name for message storage
 | MH_MONGO_URI        | -mongo-uri      | 127.0.0.1:27017 | MongoDB host and port
 | MH_SMTP_BIND_ADDR   | -smtp-bind-addr | 0.0.0.0:1025    | Interface and port for SMTP server to bind to
-| MH_STORAGE          | -storage        | memory          | Set message storage: memory / mongodb
+| MH_STORAGE          | -storage        | memory          | Set message storage: memory / mongodb / maildir
 | MH_OUTGOING_SMTP    | -outgoing-smtp  |                 | JSON file defining outgoing SMTP servers
-| MH_UI_WEB_PATH      | -ui-web-path    |                 | WebPath under which the ui is served (without leading or trailing slahes), e.g. 'mailhog'. Value defaults to ''
+| MH_UI_WEB_PATH      | -ui-web-path    |                 | WebPath under which the ui is served (without leading or trailing slahes), e.g. 'mailhog'
 
 #### Note on HTTP bind addresses
 
diff --git a/docs/RELEASES.md b/docs/RELEASES.md
index 63029c4b..0817a256 100644
--- a/docs/RELEASES.md
+++ b/docs/RELEASES.md
@@ -1,6 +1,10 @@
 MailHog Releases
 ================
 
+### [v0.2.0](https://github.com/mailhog/MailHog/releases/v0.2.0)
+- mailhog/storage#1 - fix MongoDB storage bug, and implement search, thanks @HokieTT
+- #13 - implement file based storage backend (currently without search)
+
 ### [v0.1.9](https://github.com/mailhog/MailHog/releases/v0.1.9)
 - #76 - optimise docker image size, thanks @missedone
 - #77 - fix ci by removing go-uuid, thanks @missedone