diff --git a/build.gradle b/build.gradle
index b7e37a64ea61c..b2cb12dc6b803 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
 buildTimeStr = sdf.format(buildTime)
 
-versionNumber = '0.18.7'
+versionNumber = '0.18.8-SNAPSHOT'
 
 explodedDistDir = new File(distsDir, 'exploded')
 explodedDistLibDir = new File(explodedDistDir, 'lib')
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/Version.java b/modules/elasticsearch/src/main/java/org/elasticsearch/Version.java
index ccb0c3c32ecec..3941214060003 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/Version.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/Version.java
@@ -50,8 +50,10 @@ public class Version {
     public static final Version V_0_18_6 = new Version(V_0_18_6_ID, false);
     public static final int V_0_18_7_ID = /*00*/180799;
     public static final Version V_0_18_7 = new Version(V_0_18_7_ID, false);
+    public static final int V_0_18_8_ID = /*00*/180899;
+    public static final Version V_0_18_8 = new Version(V_0_18_8_ID, true);
 
-    public static final Version CURRENT = V_0_18_7;
+    public static final Version CURRENT = V_0_18_8;
 
     public static Version readVersion(StreamInput in) throws IOException {
         return fromId(in.readVInt());
@@ -75,6 +77,8 @@ private static Version fromId(int id) {
                 return V_0_18_6;
             case V_0_18_7_ID:
                 return V_0_18_7;
+            case V_0_18_8_ID:
+                return V_0_18_8;
             default:
                 return new Version(id, null);
         }