diff --git a/update_version.py b/update_version.py
index fc4c15c14b..7a961ae139 100755
--- a/update_version.py
+++ b/update_version.py
@@ -86,11 +86,19 @@ def UpdateCpp():
       r'^#define GOOGLE_PROTOBUF_VERSION .*$',
       '#define GOOGLE_PROTOBUF_VERSION %s' % cpp_version,
       line)
+    line = re.sub(
+      r'^#define PROTOBUF_VERSION .*$',
+      '#define PROTOBUF_VERSION %s' % cpp_version,
+      line)
     if NEW_VERSION_INFO[2] == '0':
       line = re.sub(
         r'^#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION .*$',
         '#define GOOGLE_PROTOBUF_MIN_LIBRARY_VERSION %s' % cpp_version,
         line)
+      line = re.sub(
+        r'^#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC .*$',
+        '#define PROTOBUF_MIN_HEADER_VERSION_FOR_PROTOC %s' % cpp_version,
+        line)
       line = re.sub(
         r'^#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION .*$',
         '#define GOOGLE_PROTOBUF_MIN_PROTOC_VERSION %s' % cpp_version,
@@ -105,6 +113,7 @@ def UpdateCpp():
         line)
     return line
   RewriteTextFile('src/google/protobuf/stubs/common.h', RewriteCpp)
+  RewriteTextFile('src/google/protobuf/port_def.inc', RewriteCpp)
 
 
 def UpdateCsharp():
@@ -125,6 +134,10 @@ def UpdateJava():
     lambda document : ReplaceText(
       Find(document.documentElement, 'version'), NEW_VERSION))
 
+  RewriteXml('java/bom/pom.xml',
+    lambda document : ReplaceText(
+      Find(document.documentElement, 'version'), NEW_VERSION))
+
   RewriteXml('java/core/pom.xml',
     lambda document : ReplaceText(
       Find(Find(document.documentElement, 'parent'), 'version'),