diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98162a90..ba4f1cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v6.5.0.0 - WIP
+
+* Support for Ext JS 6.5
+* Support for Rails 5.1
+* New version convention: the first 2 numbers correspond to the major Ext JS and Rails versions respectively.
+
 # v1.0.1.0 - 2016-05-01
 
 *   New `Netzke::Core.default_routes` config option.
diff --git a/Gemfile b/Gemfile
index 6c3070bc..b3f3a2a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,5 +22,5 @@ end
 
 group :development, :test do
   gem 'pry-rails'
-  gem 'netzke-testing', github: 'thepry/netzke-testing', branch: 'ext-6-rails-5'
+  gem 'netzke-testing', git: 'https://github.com/netzke/netzke-testing', branch: '6-5-0'
 end
diff --git a/README.md b/README.md
index 9b0af55e..fadd344e 100644
--- a/README.md
+++ b/README.md
@@ -264,9 +264,9 @@ You can access the instance of the Netzke controller via `Netzke::Base.controlle
 
 ## Requirements
 
-* Ruby >= 1.9.3
-* Rails ~> 4.2.0
-* Ext JS = 5.1.1
+* Ruby >= 2.3.0
+* Rails ~> 5.1.0
+* Ext JS = 6.5.1
 
 ## Installation
 
@@ -317,4 +317,4 @@ If you feel particularily generous, you can support the author by donating a cou
 * [Twitter](http://twitter.com/netzke) - latest news about the framework
 
 ---
-Copyright (c) 2009-2016 [Good Bit Labs](http://goodbitlabs.com/), released under the same license as [Ext JS](https://www.sencha.com/legal/#Sencha_Ext_JS)
+Copyright (c) 2009-2017 [Good Bit Labs](http://goodbitlabs.com/), released under the same license as [Ext JS](https://www.sencha.com/legal/#Sencha_Ext_JS)
diff --git a/lib/netzke/core/version.rb b/lib/netzke/core/version.rb
index d0d70b76..e4c91ade 100644
--- a/lib/netzke/core/version.rb
+++ b/lib/netzke/core/version.rb
@@ -1,5 +1,5 @@
 module Netzke
   module Core
-    VERSION = "6.5.0.0"
+    VERSION = "6.5.0.0.rc1"
   end
 end