diff --git a/core/pom.xml b/core/pom.xml
index 325232d087e..d4fb7f95342 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch</groupId>
diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java
index d820a1b2427..5ba63c4811b 100644
--- a/core/src/main/java/org/elasticsearch/Version.java
+++ b/core/src/main/java/org/elasticsearch/Version.java
@@ -255,10 +255,8 @@ public class Version {
 
     public static final int V_2_0_0_beta1_ID = 2000001;
     public static final Version V_2_0_0_beta1 = new Version(V_2_0_0_beta1_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1);
-    public static final int V_2_0_0_ID = 2000099;
-    public static final Version V_2_0_0 = new Version(V_2_0_0_ID, true, org.apache.lucene.util.Version.LUCENE_5_2_1);
 
-    public static final Version CURRENT = V_2_0_0;
+    public static final Version CURRENT = V_2_0_0_beta1;
 
     static {
         assert CURRENT.luceneVersion.equals(Lucene.VERSION) : "Version must be upgraded to [" + Lucene.VERSION + "] is still set to [" + CURRENT.luceneVersion + "]";
@@ -270,8 +268,6 @@ public class Version {
 
     public static Version fromId(int id) {
         switch (id) {
-            case V_2_0_0_ID:
-                return V_2_0_0;
             case V_2_0_0_beta1_ID:
                 return V_2_0_0_beta1;
             case V_1_7_2_ID:
diff --git a/core/src/test/java/org/elasticsearch/VersionTests.java b/core/src/test/java/org/elasticsearch/VersionTests.java
index 76c0d8d19d3..3f4891cd825 100644
--- a/core/src/test/java/org/elasticsearch/VersionTests.java
+++ b/core/src/test/java/org/elasticsearch/VersionTests.java
@@ -203,10 +203,6 @@ public class VersionTests extends ESTestCase {
                 
                 // only the latest version for a branch should be a snapshot (ie unreleased)
                 String branchName = "" + v.major + "." + v.minor;
-                if (v.equals(Version.V_2_0_0_beta1)) {
-                    assertTrue("Remove this once beta1 is released", v.snapshot());
-                    continue; // this is just a temporary fix until we have a snapshot for the beta since we now have 2 unreleased version of the same major.minor group
-                }
                 Version maxBranchVersion = maxBranchVersions.get(branchName);
                 if (maxBranchVersion == null) {
                     maxBranchVersions.put(branchName, v);
diff --git a/dev-tools/pom.xml b/dev-tools/pom.xml
index 0daa4cbad51..369c003beee 100644
--- a/dev-tools/pom.xml
+++ b/dev-tools/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-dev-tools</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0-beta1-SNAPSHOT</version>
   <name>Elasticsearch Build Resources</name>
   <parent>
       <groupId>org.sonatype.oss</groupId>
diff --git a/distribution/deb/pom.xml b/distribution/deb/pom.xml
index 5706f8f55dc..c944dcc7c04 100644
--- a/distribution/deb/pom.xml
+++ b/distribution/deb/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution.deb</groupId>
diff --git a/distribution/fully-loaded/pom.xml b/distribution/fully-loaded/pom.xml
index 91988f187ab..9fef31640d9 100644
--- a/distribution/fully-loaded/pom.xml
+++ b/distribution/fully-loaded/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution.fully-loaded</groupId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d3b518fd1a1..9a01416ba30 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution</groupId>
diff --git a/distribution/rpm/pom.xml b/distribution/rpm/pom.xml
index d48aca8a125..698c310ecc3 100644
--- a/distribution/rpm/pom.xml
+++ b/distribution/rpm/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution.rpm</groupId>
diff --git a/distribution/shaded/pom.xml b/distribution/shaded/pom.xml
index 698b0907d66..3163a8053b3 100644
--- a/distribution/shaded/pom.xml
+++ b/distribution/shaded/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution.shaded</groupId>
diff --git a/distribution/tar/pom.xml b/distribution/tar/pom.xml
index c0ebae4b760..3c41c5d87e5 100644
--- a/distribution/tar/pom.xml
+++ b/distribution/tar/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution.tar</groupId>
diff --git a/distribution/zip/pom.xml b/distribution/zip/pom.xml
index 3749e9087c6..afa3dc286eb 100644
--- a/distribution/zip/pom.xml
+++ b/distribution/zip/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.elasticsearch.distribution</groupId>
         <artifactId>elasticsearch-distribution</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.elasticsearch.distribution.zip</groupId>
diff --git a/plugins/analysis-icu/pom.xml b/plugins/analysis-icu/pom.xml
index d0679295787..1214cbc82c0 100644
--- a/plugins/analysis-icu/pom.xml
+++ b/plugins/analysis-icu/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-icu</artifactId>
diff --git a/plugins/analysis-kuromoji/pom.xml b/plugins/analysis-kuromoji/pom.xml
index 1ac11b858b6..7cb0fa762ea 100644
--- a/plugins/analysis-kuromoji/pom.xml
+++ b/plugins/analysis-kuromoji/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-kuromoji</artifactId>
diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml
index f355a255a3f..f5bafe2b865 100644
--- a/plugins/analysis-phonetic/pom.xml
+++ b/plugins/analysis-phonetic/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-phonetic</artifactId>
diff --git a/plugins/analysis-smartcn/pom.xml b/plugins/analysis-smartcn/pom.xml
index b0ed1943d23..178d5f142a6 100644
--- a/plugins/analysis-smartcn/pom.xml
+++ b/plugins/analysis-smartcn/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-smartcn</artifactId>
diff --git a/plugins/analysis-stempel/pom.xml b/plugins/analysis-stempel/pom.xml
index febe5eb94ab..4f8f59c0611 100644
--- a/plugins/analysis-stempel/pom.xml
+++ b/plugins/analysis-stempel/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-analysis-stempel</artifactId>
diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml
index 04417a9b724..35edcf5d238 100644
--- a/plugins/cloud-aws/pom.xml
+++ b/plugins/cloud-aws/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-cloud-aws</artifactId>
diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml
index ff67fc31600..c339c114cb1 100644
--- a/plugins/cloud-azure/pom.xml
+++ b/plugins/cloud-azure/pom.xml
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-cloud-azure</artifactId>
diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml
index f0133c8ef6e..48a7b26542e 100644
--- a/plugins/cloud-gce/pom.xml
+++ b/plugins/cloud-gce/pom.xml
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-cloud-gce</artifactId>
diff --git a/plugins/delete-by-query/pom.xml b/plugins/delete-by-query/pom.xml
index 222d00585ff..62ee8fdb9b1 100644
--- a/plugins/delete-by-query/pom.xml
+++ b/plugins/delete-by-query/pom.xml
@@ -18,7 +18,7 @@ governing permissions and limitations under the License. -->
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-delete-by-query</artifactId>
diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml
index e1ae181e7c1..eb6e21cd704 100644
--- a/plugins/lang-javascript/pom.xml
+++ b/plugins/lang-javascript/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-lang-javascript</artifactId>
diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml
index a88bdd66ac0..b69a07b0ed7 100644
--- a/plugins/lang-python/pom.xml
+++ b/plugins/lang-python/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-lang-python</artifactId>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 77278b0d7fb..2d8e9387d9c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>org.elasticsearch.plugin</groupId>
     <artifactId>elasticsearch-plugin</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0-beta1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elasticsearch Plugin POM</name>
     <inceptionYear>2009</inceptionYear>
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.elasticsearch</groupId>
         <artifactId>elasticsearch-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/plugins/site-example/pom.xml b/plugins/site-example/pom.xml
index 0a6beb1a0b0..15060e0bd52 100644
--- a/plugins/site-example/pom.xml
+++ b/plugins/site-example/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>elasticsearch-plugin</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
 
     <artifactId>elasticsearch-site-example</artifactId>
diff --git a/pom.xml b/pom.xml
index 2262f68dfa9..188ed85015e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-parent</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0-beta1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elasticsearch Parent POM</name>
     <description>Elasticsearch Parent POM</description>
diff --git a/rest-api-spec/pom.xml b/rest-api-spec/pom.xml
index 46f2e6e7213..178c55b8770 100644
--- a/rest-api-spec/pom.xml
+++ b/rest-api-spec/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.elasticsearch</groupId>
   <artifactId>elasticsearch-rest-api-spec</artifactId>
-  <version>2.0.0-SNAPSHOT</version>
+  <version>2.0.0-beta1-SNAPSHOT</version>
   <name>Elasticsearch Rest API Spec</name>
   <parent>
       <groupId>org.sonatype.oss</groupId>
@@ -34,4 +34,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>