diff --git a/README.md b/README.md
index 5ec97ee33..ba585409c 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,15 @@ For an up-to-date list of all supported Ruby versions, please see our [`.travis.
 
 Please see the [CONTRIBUTING](CONTRIBUTING.md) file.
 
+## Code branches
+
+We use two branches for development: "master" and "still". The "master" branch
+contains the code of the current major version. The "still" branch is used for the
+old major version. New features are only added to "master". The still branch is
+still maintained, but only get fixes for major bugs though having the still
+branch shall be considered as experimental - we need to find out how work it is
+to maintain two branches of code.
+
 ## Build Status
 
 |Version|Linux / OS X|Windows|
diff --git a/features/README.md b/features/README.md
index 397b19a8e..482fa16ec 100644
--- a/features/README.md
+++ b/features/README.md
@@ -174,9 +174,20 @@ for the most up to date documentation.
 
 ## Development
 
+### Api Documentation
+
 A full documentation of the API can be found
 [here](http://www.rubydoc.info/github/cucumber/aruba/master/frames).
 
+### Code branches
+
+We use two branches for development: "master" and "still". The "master" branch
+contains the code of the current major version. The "still" branch is used for the
+old major version. New features are only added to "master". The still branch is
+still maintained, but only get fixes for major bugs though having the still
+branch shall be considered as experimental - we need to find out how work it is
+to maintain two branches of code.
+
 # Initialize an existing project
 
 There's an initializer to make it easier for you to get started.