diff --git a/src/google/protobuf/compiler/javanano/javanano_generator.cc b/src/google/protobuf/compiler/javanano/javanano_generator.cc
index a342e6bb0f..7c3a04212f 100644
--- a/src/google/protobuf/compiler/javanano/javanano_generator.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_generator.cc
@@ -68,6 +68,9 @@ void UpdateParamsRecursively(Params& params,
   }
   if (file->options().has_java_package()) {
     string result = file->options().java_package();
+    if (!result.empty()) {
+      result += ".";
+    }
     result += "nano";
     params.set_java_package(
       file->name(), result);