diff --git a/java/lib/protobuf-java-2.6.1.jar b/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
similarity index 100%
rename from java/lib/protobuf-java-2.6.1.jar
rename to java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.jar
diff --git a/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom b/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
new file mode 100644
index 000000000..a9f88e001
--- /dev/null
+++ b/java/lib/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
@@ -0,0 +1,9 @@
+
+
+ 4.0.0
+ com.google.protobuf
+ protobuf-java
+ 2.6.1
+ POM was created from install:install-file
+
diff --git a/java/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml b/java/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml
new file mode 100644
index 000000000..fdb85172a
--- /dev/null
+++ b/java/lib/com/google/protobuf/protobuf-java/maven-metadata-local.xml
@@ -0,0 +1,12 @@
+
+
+ com.google.protobuf
+ protobuf-java
+
+ 2.6.1
+
+ 2.6.1
+
+ 20151102180249
+
+
diff --git a/java/libphonenumber/pom.xml b/java/libphonenumber/pom.xml
index c11497edd..dce69fb80 100644
--- a/java/libphonenumber/pom.xml
+++ b/java/libphonenumber/pom.xml
@@ -46,4 +46,18 @@
+
+
+ protobuf-java-lib
+ file://${project.basedir}/../lib
+
+
+
+
+ com.google.protobuf
+ protobuf-java
+ 2.6.1
+
+
+
diff --git a/java/pom.xml b/java/pom.xml
index 9e777ced6..f2a6b5c6f 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -180,11 +180,6 @@
4.8.1
test
-
- com.google.protobuf
- protobuf-java
- 2.6.1
-
diff --git a/tools/java/common/pom.xml b/tools/java/common/pom.xml
index 418d64a84..456c7f589 100644
--- a/tools/java/common/pom.xml
+++ b/tools/java/common/pom.xml
@@ -49,6 +49,12 @@
+
+
+ protobuf-java-lib
+ file://${project.basedir}/../../../java/lib
+
+
junit
diff --git a/tools/java/cpp-build/pom.xml b/tools/java/cpp-build/pom.xml
index e745fde71..c99811dea 100644
--- a/tools/java/cpp-build/pom.xml
+++ b/tools/java/cpp-build/pom.xml
@@ -114,6 +114,12 @@
+
+
+ protobuf-java-lib
+ file://${project.basedir}/../../../java/lib
+
+
junit
diff --git a/tools/java/java-build/pom.xml b/tools/java/java-build/pom.xml
index 47eaebd2b..77d860bef 100644
--- a/tools/java/java-build/pom.xml
+++ b/tools/java/java-build/pom.xml
@@ -101,6 +101,12 @@
+
+
+ protobuf-java-lib
+ file://${project.basedir}/../../../java/lib
+
+
junit