diff --git a/java/carrier/pom.xml b/java/carrier/pom.xml
index 74d39da34..b0ff34086 100644
--- a/java/carrier/pom.xml
+++ b/java/carrier/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>carrier</artifactId>
-  <version>2.4-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -81,12 +81,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.4-SNAPSHOT</version>
+      <version>9.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>3.4-SNAPSHOT</version>
+      <version>3.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index 1f79d9b0d..fb485df5e 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -3,13 +3,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>9.0.4-SNAPSHOT</version>
+  <version>9.0.5-SNAPSHOT</version>
   <packaging>war</packaging>
   <url>https://github.com/google/libphonenumber/</url>
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -68,17 +68,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.4-SNAPSHOT</version>
+      <version>9.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>3.4-SNAPSHOT</version>
+      <version>3.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <version>2.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
index caa545f0b..9e0d30f82 100644
--- a/java/geocoder/pom.xml
+++ b/java/geocoder/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>geocoder</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -91,12 +91,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.4-SNAPSHOT</version>
+      <version>9.0.5-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>3.4-SNAPSHOT</version>
+      <version>3.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/internal/prefixmapper/pom.xml b/java/internal/prefixmapper/pom.xml
index b71822796..a3d3be649 100644
--- a/java/internal/prefixmapper/pom.xml
+++ b/java/internal/prefixmapper/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>prefixmapper</artifactId>
-  <version>3.4-SNAPSHOT</version>
+  <version>3.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>9.0.4-SNAPSHOT</version>
+      <version>9.0.5-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index da4e84ac5..addda3e1c 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -2,14 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>libphonenumber</artifactId>
-  <version>9.0.4-SNAPSHOT</version>
+  <version>9.0.5-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>9.0.4-SNAPSHOT</version>
+    <version>9.0.5-SNAPSHOT</version>
   </parent>
 
   <build>
diff --git a/java/pom.xml b/java/pom.xml
index 6783961a4..dd2ccb158 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>9.0.4-SNAPSHOT</version>
+  <version>9.0.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://github.com/google/libphonenumber/</url>
 
@@ -37,7 +37,7 @@
     <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git
     </developerConnection>
     <url>https://github.com/google/libphonenumber/</url>
-    <tag>v8.13.51</tag>
+    <tag>v9.0.4</tag>
   </scm>
 
   <properties>