diff --git a/.gitignore b/.gitignore
index 0560a6068..a75287041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 OWNERS
 README.google
+google/internal
diff --git a/google/protobuf/duration.proto b/google/protobuf/duration.proto
index 15e9d44d3..7251bf5fa 100644
--- a/google/protobuf/duration.proto
+++ b/google/protobuf/duration.proto
@@ -14,6 +14,7 @@
 
 syntax = "proto3";
 
+option javanano_use_deprecated_package = true;
 package google.protobuf;
 
 option java_generate_equals_and_hash = true;
diff --git a/google/protobuf/empty.proto b/google/protobuf/empty.proto
index 43b06e87b..a542fb903 100644
--- a/google/protobuf/empty.proto
+++ b/google/protobuf/empty.proto
@@ -18,6 +18,7 @@ package google.protobuf;
 
 option java_multiple_files = true;
 option java_outer_classname = "EmptyProto";
+option javanano_use_deprecated_package = true;
 option java_package = "com.google.protobuf";
 
 
diff --git a/google/protobuf/field_mask.proto b/google/protobuf/field_mask.proto
index 46099d8ef..0ba0e1d9f 100644
--- a/google/protobuf/field_mask.proto
+++ b/google/protobuf/field_mask.proto
@@ -18,6 +18,7 @@ package google.protobuf;
 
 option java_multiple_files = true;
 option java_outer_classname = "FieldMaskProto";
+option javanano_use_deprecated_package = true;
 option java_package = "com.google.protobuf";
 
 
diff --git a/google/protobuf/timestamp.proto b/google/protobuf/timestamp.proto
index b13585498..140482095 100644
--- a/google/protobuf/timestamp.proto
+++ b/google/protobuf/timestamp.proto
@@ -19,6 +19,7 @@ package google.protobuf;
 option java_generate_equals_and_hash = true;
 option java_multiple_files = true;
 option java_outer_classname = "TimestampProto";
+option javanano_use_deprecated_package = true;
 option java_package = "com.google.protobuf";
 
 
diff --git a/google/protobuf/type.proto b/google/protobuf/type.proto
index c4a945433..87af26b36 100644
--- a/google/protobuf/type.proto
+++ b/google/protobuf/type.proto
@@ -21,6 +21,7 @@ import "google/protobuf/source_context.proto";
 
 option java_multiple_files = true;
 option java_outer_classname = "TypeProto";
+option javanano_use_deprecated_package = true;
 option java_package = "com.google.protobuf";
 
 
diff --git a/google/rpc/code.proto b/google/rpc/code.proto
index eff75d707..03c803067 100644
--- a/google/rpc/code.proto
+++ b/google/rpc/code.proto
@@ -18,6 +18,7 @@ package google.rpc;
 
 option java_multiple_files = true;
 option java_outer_classname = "CodeProto";
+option javanano_use_deprecated_package = true;
 option java_package = "com.google.rpc";