diff --git a/java/demo/pom.xml b/java/demo/pom.xml
index 6271985ef..b9fdbdf1a 100644
--- a/java/demo/pom.xml
+++ b/java/demo/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <artifactId>libphonenumber-parent</artifactId>
     <groupId>com.googlecode.libphonenumber</groupId>
-    <version>5.8-SNAPSHOT</version>
+    <version>5.8</version>
   </parent>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>5.8-SNAPSHOT</version>
+  <version>5.8</version>
 
   <properties>
     <gae.version>1.5.4</gae.version>
@@ -43,12 +43,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>5.8-SNAPSHOT</version>
+      <version>5.8</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.9-SNAPSHOT</version>
+      <version>2.9</version>
     </dependency>
   </dependencies>
 
diff --git a/java/geocoder/pom.xml b/java/geocoder/pom.xml
index e523713cf..dd87a262e 100644
--- a/java/geocoder/pom.xml
+++ b/java/geocoder/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.9-SNAPSHOT</version>
+  <version>2.9</version>
   <packaging>jar</packaging>
   <url>http://code.google.com/p/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>5.8-SNAPSHOT</version>
+    <version>5.8</version>
   </parent>
 
   <build>
@@ -34,7 +34,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>5.8-SNAPSHOT</version>
+      <version>5.8</version>
     </dependency>
   </dependencies>
 
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index fd704eb4e..fe8744d6b 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>5.8-SNAPSHOT</version>
+  <version>5.8</version>
   <packaging>jar</packaging>
   <url>http://code.google.com/p/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>5.8-SNAPSHOT</version>
+    <version>5.8</version>
   </parent>
 
   <build>
diff --git a/java/pom.xml b/java/pom.xml
index 3d02b4788..0a955c9cf 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>5.8-SNAPSHOT</version>
+  <version>5.8</version>
   <packaging>pom</packaging>
   <url>http://code.google.com/p/libphonenumber/</url>
 
@@ -31,9 +31,9 @@
   </licenses>
 
   <scm>
-    <connection>scm:svn:http://libphonenumber.googlecode.com/svn/trunk/java/</connection>
-    <developerConnection>scm:svn:https://libphonenumber.googlecode.com/svn/trunk/java/</developerConnection>
-    <url>scm:svn:http://libphonenumber.googlecode.com/svn/trunk/java/</url>
+    <connection>scm:svn:http://libphonenumber.googlecode.com/svn/tags/libphonenumber-5.8</connection>
+    <developerConnection>scm:svn:https://libphonenumber.googlecode.com/svn/tags/libphonenumber-5.8</developerConnection>
+    <url>scm:svn:http://libphonenumber.googlecode.com/svn/tags/libphonenumber-5.8</url>
   </scm>
 
   <properties>