diff --git a/tools/build/bazel/publish_catalog.bzl b/tools/build/bazel/publish_catalog.bzl
index 9251aab..7f0db76 100644
--- a/tools/build/bazel/publish_catalog.bzl
+++ b/tools/build/bazel/publish_catalog.bzl
@@ -6,7 +6,7 @@
 #     egrep "DEBUG: .*mvn_jar.bzl" | cut -d\  -f3-
 
 def _remote(group_id, artifact_id, version, packaging, classifier):
-    p = group_id + "/" + artifact_id + "/" + version + "/" + artifact_id + "-" + version
+    p = group_id.replace(".", "/") + "/" + artifact_id + "/" + version + "/" + artifact_id + "-" + version
     if classifier != None:
       p += "-" + classifier
     p += "." + packaging
diff --git a/tools/build/onos-publish-catalog b/tools/build/onos-publish-catalog
new file mode 100755
index 0000000..d908621
--- /dev/null
+++ b/tools/build/onos-publish-catalog
@@ -0,0 +1,40 @@
+#!/bin/bash
+# -----------------------------------------------------------------------------
+# Generates a catalog for publishing ONOS artifacts to a Maven repository.
+# -----------------------------------------------------------------------------
+
+CATALOG=/tmp/onos.catalog
+
+rm -f $CATALOG
+
+SHLVL=1     # Required not to have Bazel rebuild everything!
+
+function writeCatalog {
+    bazel build $* --aspects tools/build/bazel/publish_catalog.bzl%publish_catalog 2>&1 \
+        | egrep "^DEBUG: " | cut -d\  -f3- >> $CATALOG
+}
+
+function jars {
+    egrep -v '(\# |grpc/api|build/conf)' tools/build/publish-target-list
+}
+
+function testJars {
+    egrep -v '(# |grpc/api|build/conf)' tools/build/publish-test-target-list
+}
+
+
+echo "Cataloging jar files..."
+writeCatalog $(jars)
+
+echo "Cataloging test jars..."
+writeCatalog $(testJars)
+
+echo "Cataloging source jars..."
+writeCatalog $(jars | sed 's/$/-sources/')
+echo "Cataloging javadoc jars..."
+writeCatalog $(jars | sed 's/$/-javadoc/')
+echo "Cataloging pom files..."
+writeCatalog $(jars | sed 's/$/-pom/')
+
+echo "Cataloging oar files..."
+writeCatalog $(bazel query 'kind("_onos_oar rule", //...)')