diff --git a/README.md b/README.md
index a5120e6..e50120a 100644
--- a/README.md
+++ b/README.md
@@ -3,15 +3,22 @@ JavaScript lang Plugin for Elasticsearch
 
 The JavaScript language plugin allows to have `javascript` (or `js`) as the language of scripts to execute.
 
-In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-lang-javascript/2.0.0.RC1`.
+In order to install the plugin, simply run: `bin/plugin -install elasticsearch/elasticsearch-lang-javascript/2.1.0`.
 
-* For 1.0.x elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/master).
-* For 0.90.x elasticsearch versions, look at [1.x branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/1.x).
+* For master elasticsearch versions, look at [master branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/master).
+* For 1.1.x elasticsearch versions, look at [es-1.1 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-1.1).
+* For 1.0.x elasticsearch versions, look at [es-1.0 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-1.0).
+* For 0.90.x elasticsearch versions, look at [es-0.90 branch](https://github.com/elasticsearch/elasticsearch-lang-javascript/tree/es-0.90).
 
 |   JavaScript Lang Plugin    |    elasticsearch    |  rhino   | Release date |
 |-----------------------------|---------------------|----------|:------------:|
-| 2.0.0-SNAPSHOT              | 1.0.0.RC1 -> master |  1.7R4   |  XXXX-XX-XX  |
-| 2.0.0.RC1                   | 1.0.0.RC1 -> master |  1.7R4   |  2014-01-15  |
+| 2.1.1-SNAPSHOT              | 1.1.0 -> 1.1        |  1.7R4   |  XXXX-XX-XX  |
+| 2.1.0                       | 1.1.0 -> 1.1        |  1.7R4   |  2014-03-28  |
+
+Please read documentation relative to the version you are using:
+
+* [2.1.1-SNAPSHOT](https://github.com/elasticsearch/elasticsearch-lang-javascript/blob/es-1.1/README.md)
+* [2.1.0](https://github.com/elasticsearch/elasticsearch-lang-javascript/blob/v2.1.0/README.md)
 
 Using javascript with function_score
 ------------------------------------
diff --git a/dev-tools/build_release.py b/dev-tools/build_release.py
index 74acd8c..db83454 100755
--- a/dev-tools/build_release.py
+++ b/dev-tools/build_release.py
@@ -208,6 +208,29 @@ def callback(line):
             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 @@ def check_email_settings():
     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 @@ def check_email_settings():
     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 @@ def check_email_settings():
 
         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 0491010..4f525c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-lang-javascript</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>Elasticsearch JavaScript language plugin</name>
     <description>The JavaScript language plugin allows to have javascript as the language of scripts to execute.</description>
@@ -32,7 +32,7 @@
     </parent>
 
     <properties>
-        <elasticsearch.version>1.0.1</elasticsearch.version>
+        <elasticsearch.version>1.1.0</elasticsearch.version>
         <lucene.version>4.7.0</lucene.version>
         <tests.jvms>1</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
diff --git a/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptSearchTests.java b/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptSearchTests.java
index f8918d4..d8eebd7 100644
--- a/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptSearchTests.java
+++ b/src/test/java/org/elasticsearch/script/javascript/JavaScriptScriptSearchTests.java
@@ -44,7 +44,6 @@ public class JavaScriptScriptSearchTests extends ElasticsearchIntegrationTest {
 
     @Test
     public void testJavaScriptFilter() throws Exception {
-        wipeIndices("test");
         createIndex("test");
         index("test", "type1", "1", jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).endObject());
         flush();
@@ -95,7 +94,6 @@ public void testJavaScriptFilter() throws Exception {
 
     @Test
     public void testScriptFieldUsingSource() throws Exception {
-        wipeIndices("test");
         createIndex("test");
         index("test", "type1", "1",
                 jsonBuilder().startObject()
@@ -130,7 +128,6 @@ public void testScriptFieldUsingSource() throws Exception {
 
     @Test
     public void testCustomScriptBoost() throws Exception {
-        wipeIndices("test");
         createIndex("test");
         index("test", "type1", "1", jsonBuilder().startObject().field("test", "value beck").field("num1", 1.0f).endObject());
         index("test", "type1", "2", jsonBuilder().startObject().field("test", "value beck").field("num1", 2.0f).endObject());