diff --git a/README.md b/README.md
index 9de9b4a3ed0..75521a6f6ef 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,18 @@ The Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis modul
 
 In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-analysis-smartcn/2.0.0`.
 
-* For 1.0.x elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/tree/master).
-* For 0.90.x elasticsearch versions, look at [1.x branch](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/tree/1.x).
+* For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/tree/master).
+* For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/tree/es-1.1).
+* For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/tree/es-1.0).
+* For 0.90.x elasticsearch versions, look at [es-0.90 branch](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/tree/es-0.90).
 
 | Smart Chinese Analysis Plugin |    elasticsearch    | Release date |
 |-------------------------------|---------------------|:------------:|
-| 2.1.0-SNAPSHOT                | 1.0.0.RC1 -> master |  XXXX-XX-XX  |
-| 2.0.0                         | 1.0.0.RC1 -> master |  2014-02-28  |
-| 2.0.0.RC1                     | 1.0.0.RC1 -> master |  2014-01-15  |
+| 3.0.0-SNAPSHOT                | master              |  XXXX-XX-XX  |
 
+Please read documentation relative to the version you are using:
+
+* [3.0.0-SNAPSHOT](https://github.com/elasticsearch/elasticsearch-analysis-smartcn/blob/master/README.md)
 
 The plugin includes the `smart_chinese` analyzer, `smartcn_sentence` tokenizer, and `smartcn_word` token filter.
 
diff --git a/dev-tools/build_release.py b/dev-tools/build_release.py
index 74acd8c5f4e..db8345440c7 100755
--- a/dev-tools/build_release.py
+++ b/dev-tools/build_release.py
@@ -208,6 +208,29 @@ def add_version_snapshot(readme_file, release, snapshot):
             return line
     process_file(readme_file, callback)
 
+# Moves the README.md file from a snapshot to a release (documentation link)
+def remove_documentation_snapshot(readme_file, repo_url, release, branch):
+    pattern = '* [%s-SNAPSHOT](%sblob/%s/README.md)' % (release, repo_url, branch)
+    replacement = '* [%s](%sblob/v%s/README.md)' % (release, repo_url, release)
+    def callback(line):
+        # If we find pattern, we replace its content
+        if line.find(pattern) >= 0:
+            return line.replace(pattern, replacement)
+        else:
+            return line
+    process_file(readme_file, callback)
+
+# Add in README.markdown file the documentation for the next version
+def add_documentation_snapshot(readme_file, repo_url, release, snapshot, branch):
+    pattern = '* [%s](%sblob/v%s/README.md)' % (release, repo_url, release)
+    replacement = '* [%s-SNAPSHOT](%sblob/%s/README.md)' % (snapshot, repo_url, branch)
+    def callback(line):
+        # If we find pattern, we copy the line and replace its content
+        if line.find(pattern) >= 0:
+            return line.replace(pattern, replacement)+line
+        else:
+            return line
+    process_file(readme_file, callback)
 
 # Set release date in README.md file
 def set_date(readme_file):
@@ -603,8 +626,12 @@ if __name__ == '__main__':
     artifact_name = find_from_pom('name')
     artifact_description = find_from_pom('description')
     project_url = find_from_pom('url')
+    elasticsearch_version = find_from_pom('elasticsearch.version')
     print('  Artifact Id: [%s]' % artifact_id)
     print('  Release version: [%s]' % release_version)
+    print('  Elasticsearch: [%s]' % elasticsearch_version)
+    if elasticsearch_version.find('-SNAPSHOT') != -1:
+        raise RuntimeError('Can not release with a SNAPSHOT elasticsearch dependency: %s' % elasticsearch_version)
 
     # extract snapshot
     default_snapshot_version = guess_snapshot(release_version)
@@ -626,6 +653,7 @@ if __name__ == '__main__':
     try:
         pending_files = [POM_FILE, README_FILE]
         remove_maven_snapshot(POM_FILE, release_version)
+        remove_documentation_snapshot(README_FILE, project_url, release_version, src_branch)
         remove_version_snapshot(README_FILE, release_version)
         set_date(README_FILE)
         set_install_instructions(README_FILE, artifact_id, release_version)
@@ -657,6 +685,7 @@ if __name__ == '__main__':
 
         add_maven_snapshot(POM_FILE, release_version, snapshot_version)
         add_version_snapshot(README_FILE, release_version, snapshot_version)
+        add_documentation_snapshot(README_FILE, project_url, release_version, snapshot_version, src_branch)
         add_pending_files(*pending_files)
         commit_snapshot()
 
diff --git a/pom.xml b/pom.xml
index c7211c0589d..2d3ceb28036 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-analysis-smartcn</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Elasticsearch Smart Chinese Analysis plugin</name>
     <description>Smart Chinese Analysis plugin integrates Lucene Smart Chinese analysis module into elasticsearch.</description>
@@ -32,8 +32,8 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>1.0.0</elasticsearch.version>
-        <lucene.version>4.6.1</lucene.version>
+        <elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
+        <lucene.version>4.7.0</lucene.version>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>