diff --git a/VERSION.txt b/VERSION.txt
index 2fb8e6bef0f..808d430f4ff 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1,4 +1,7 @@
-jetty-9.3.24-SNAPSHOT
+jetty-9.3.25-SNAPSHOT
+
+jetty-9.3.24.v20180521 - 21 May 2018
+ + 2529 HttpParser cleanup
 
 jetty-9.3.23.v20180228 - 28 February 2018
  + 347 Avoid sending request using a connection that is idle timing out
diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml
index 1c6055bbd02..cdc91a0364e 100644
--- a/jetty-bom/pom.xml
+++ b/jetty-bom/pom.xml
@@ -103,17 +103,17 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>cdi-core</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>cdi-servlet</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>cdi-websocket</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
@@ -138,12 +138,12 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-gcloud-memcached-session-manager</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-gcloud-session-manager</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
@@ -228,17 +228,17 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-osgi-boot</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-osgi-boot-jsp</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-osgi-boot-warurl</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
@@ -303,37 +303,37 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-client-impl</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-server-impl</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-api</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-client</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-common</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-server</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>javax-websocket-servlet</artifactId>
-        <version>9.3.24-SNAPSHOT</version>
+        <version>9.3.25-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>