diff --git a/CHANGES.md b/CHANGES.md
index 6d4be9324..fb58d0ae1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 # Changes
 
+## 0.6.0 (...)
+
+* Websocket CloseCode Empty/Status is ambiguous #193
+
+
 ## 0.5.6 (2018-04-24)
 
 * Make flate2 crate optional #200
diff --git a/Cargo.toml b/Cargo.toml
index 425ec701f..e8f70fd45 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "0.5.6"
+version = "0.6.0-dev"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
diff --git a/MIGRATION-0.4-0.5.md b/MIGRATION.md
similarity index 85%
rename from MIGRATION-0.4-0.5.md
rename to MIGRATION.md
index d618e0545..63c4989e3 100644
--- a/MIGRATION-0.4-0.5.md
+++ b/MIGRATION.md
@@ -1,4 +1,10 @@
-# Migration from 0.4 to 0.5
+## Migration from 0.5 to 0.6
+
+* `ws::Message::Close` now includes optional close reason.
+  `ws::CloseCode::Status` and `ws::CloseCode::Empty` have been removed.
+
+
+## Migration from 0.4 to 0.5
 
 * `HttpResponseBuilder::body()`, `.finish()`, `.json()`
    methods return `HttpResponse` instead of `Result<HttpResponse>`