diff --git a/BUILD b/BUILD
index 854c58f..573eefe 100644
--- a/BUILD
+++ b/BUILD
@@ -82,10 +82,8 @@
         "@com_google_protobuf//:protobuf_java_util",
         "@com_google_protobuf//:protobuf_javalite",
     ],
-    remap_paths = {
-        "..": "derived/jars",
-    },
-    strip_prefix = ".",
+    package_dir = "derived/jars",
+    strip_prefix = "external",
     # Public but bazel-only visibility.
     visibility = ["//:__subpackages__"],
 )
@@ -127,11 +125,12 @@
         ":generated_resources",
         ":srcs",
     ],
+    # TODO(aiuto): Replace with pkg_filegroup when that is available.
     remap_paths = {
         "WORKSPACE.filtered": "WORKSPACE",
         # Rewrite paths coming from local repositories back into third_party.
-        "../googleapis": "third_party/googleapis",
-        "../remoteapis": "third_party/remoteapis",
+        "external/googleapis": "third_party/googleapis",
+        "external/remoteapis": "third_party/remoteapis",
     },
     strip_prefix = ".",
     # Public but bazel-only visibility.
@@ -141,8 +140,7 @@
 pkg_tar(
     name = "platforms-srcs",
     srcs = ["@platforms//:srcs"],
-    package_dir = "platforms",
-    strip_prefix = ".",
+    strip_prefix = "external",
     visibility = ["//:__subpackages__"],
 )
 
diff --git a/WORKSPACE b/WORKSPACE
index 33ca322..8f1bfd1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -812,8 +812,6 @@
 # Tools for building deb, rpm and tar files.
 dist_http_archive(
     name = "rules_pkg",
-    patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
-    patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
 )
 
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
diff --git a/distdir_deps.bzl b/distdir_deps.bzl
index 1cd689c..e64e2a7 100644
--- a/distdir_deps.bzl
+++ b/distdir_deps.bzl
@@ -203,11 +203,11 @@
         "strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
     },
     "rules_pkg": {
-        "archive": "rules_pkg-0.2.4.tar.gz",
-        "sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
+        "archive": "rules_pkg-0.4.0.tar.gz",
+        "sha256": "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
         "urls": [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
         ],
         "used_in": [
             "additional_distfiles",