diff --git a/configure.ac b/configure.ac
index 7ea0c227..6015281b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ(2.59)
 # * python/setup.py
 # * src/google/protobuf/stubs/common.h
 # * src/Makefile.am (Update -version-info for LDFLAGS if needed)
-AC_INIT([protobuf],[2.0.3-SNAPSHOT],[protobuf@googlegroups.com])
+AC_INIT([protobuf],[2.0.4-SNAPSHOT],[protobuf@googlegroups.com])
 
 AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
 AC_CONFIG_HEADERS([config.h])
diff --git a/java/pom.xml b/java/pom.xml
index a98a8f42..9a5ada9d 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -11,7 +11,7 @@
   </parent>-->
   <groupId>com.google.protobuf</groupId>
   <artifactId>protobuf-java</artifactId>
-  <version>2.0.3-SNAPSHOT</version>
+  <version>2.0.4-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Protocol Buffer Java API</name>
   <description>
diff --git a/python/setup.py b/python/setup.py
index cda2c0eb..3ae8fd9f 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -102,7 +102,7 @@ if __name__ == '__main__':
     generate_proto("../src/google/protobuf/descriptor.proto")
 
   setup(name = 'protobuf',
-        version = '2.0.3-SNAPSHOT',
+        version = '2.0.4-SNAPSHOT',
         packages = [ 'google' ],
         namespace_packages = [ 'google' ],
         test_suite = 'setup.MakeTestSuite',
diff --git a/src/google/protobuf/stubs/common.h b/src/google/protobuf/stubs/common.h
index b62d0e33..c3e7f1be 100644
--- a/src/google/protobuf/stubs/common.h
+++ b/src/google/protobuf/stubs/common.h
@@ -83,7 +83,7 @@ namespace internal {
 
 // The current version, represented as a single integer to make comparison
 // easier:  major * 10^6 + minor * 10^3 + micro
-#define GOOGLE_PROTOBUF_VERSION 2000003
+#define GOOGLE_PROTOBUF_VERSION 2000004
 
 // The minimum library version which works with the current version of the
 // headers.