diff --git a/resources/config_bundles/common/patch_order.list b/resources/config_bundles/common/patch_order.list
index 2bd05ea4..da06c94d 100644
--- a/resources/config_bundles/common/patch_order.list
+++ b/resources/config_bundles/common/patch_order.list
@@ -41,6 +41,7 @@ debian/fixes/gpu-timeout.patch
 debian/fixes/duplicate-name.patch
 debian/fixes/overloaded-call.patch
 debian/fixes/incomplete-types.patch
+debian/fixes/ambiguous-aliases.patch
 debian/fixes/widevine-revision.patch
 debian/fixes/connection-message.patch
 debian/fixes/chromedriver-revision.patch
diff --git a/resources/packaging/debian/buster/control b/resources/packaging/debian/buster/control
index da5f1360..deb660ca 100644
--- a/resources/packaging/debian/buster/control
+++ b/resources/packaging/debian/buster/control
@@ -96,6 +96,7 @@ Depends:
  ${shlibs:Depends},
  ungoogled-chromium-common (= ${binary:Version}),
 Recommends:
+ libgl1-mesa-dri,
  fonts-liberation,
  libva1,
 Suggests:
diff --git a/resources/packaging/debian/buster/rules.in b/resources/packaging/debian/buster/rules.in
index b001b565..0b38c1d4 100755
--- a/resources/packaging/debian/buster/rules.in
+++ b/resources/packaging/debian/buster/rules.in
@@ -68,7 +68,6 @@ override_dh_auto_configure:
 	# use system flot
 	for file in $(flotpaths); do ln -sf $$file third_party/flot; done
 	# strip out system third_party libraries
-	rm -f base/third_party/libevent/BUILD.gn
 	./debian/scripts/unbundle
 
 override_dh_auto_build-arch: $ungoog{build_output}/gn
diff --git a/resources/packaging/debian/minimal/control b/resources/packaging/debian/minimal/control
index 4deb486e..d7eccd29 100644
--- a/resources/packaging/debian/minimal/control
+++ b/resources/packaging/debian/minimal/control
@@ -90,6 +90,7 @@ Depends:
  ${shlibs:Depends},
  ungoogled-chromium-common (= ${binary:Version}),
 Recommends:
+ libgl1-mesa-dri,
  fonts-liberation,
  libva1,
 Suggests:
diff --git a/resources/packaging/debian/stretch/control b/resources/packaging/debian/stretch/control
index d02f3b4f..c7aa6fa5 100644
--- a/resources/packaging/debian/stretch/control
+++ b/resources/packaging/debian/stretch/control
@@ -94,6 +94,7 @@ Depends:
  ${shlibs:Depends},
  ungoogled-chromium-common (= ${binary:Version}),
 Recommends:
+ libgl1-mesa-dri,
  fonts-liberation,
  libva1,
 Suggests:
diff --git a/resources/patches/debian/fixes/ambiguous-aliases.patch b/resources/patches/debian/fixes/ambiguous-aliases.patch
new file mode 100644
index 00000000..9efb89fa
--- /dev/null
+++ b/resources/patches/debian/fixes/ambiguous-aliases.patch
@@ -0,0 +1,75 @@
+description: fix ambiguous namespace alias errors that occur in jumbo build
+author: Michael Gilbert <mgilbert@debian.org>
+
+--- a/extensions/common/manifest_handlers/permissions_parser.cc
++++ b/extensions/common/manifest_handlers/permissions_parser.cc
+@@ -27,13 +27,13 @@
+ #include "extensions/common/url_pattern_set.h"
+ #include "url/url_constants.h"
+ 
++namespace keys = extensions::manifest_keys;
++namespace errors = extensions::manifest_errors;
++
+ namespace extensions {
+ 
+ namespace {
+ 
+-namespace keys = manifest_keys;
+-namespace errors = manifest_errors;
+-
+ struct ManifestPermissions : public Extension::ManifestData {
+   ManifestPermissions(std::unique_ptr<const PermissionSet> permissions);
+   ~ManifestPermissions() override;
+--- a/extensions/common/manifest_handlers/requirements_info.cc
++++ b/extensions/common/manifest_handlers/requirements_info.cc
+@@ -12,10 +12,10 @@
+ #include "extensions/common/error_utils.h"
+ #include "extensions/common/manifest_constants.h"
+ 
+-namespace extensions {
++namespace keys = extensions::manifest_keys;
++namespace errors = extensions::manifest_errors;
+ 
+-namespace keys = manifest_keys;
+-namespace errors = manifest_errors;
++namespace extensions {
+ 
+ RequirementsInfo::RequirementsInfo(const Manifest* manifest)
+     : webgl(false), window_shape(false) {}
+--- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
++++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
+@@ -17,13 +17,13 @@
+ #include "extensions/common/manifest_constants.h"
+ #include "extensions/common/url_pattern.h"
+ 
++namespace keys = extensions::manifest_keys;
++namespace errors = extensions::manifest_errors;
++
+ namespace extensions {
+ 
+ namespace {
+ 
+-namespace keys = extensions::manifest_keys;
+-namespace errors = manifest_errors;
+-
+ const char kDefaultSandboxedPageContentSecurityPolicy[] =
+     "sandbox allow-scripts allow-forms allow-popups allow-modals; "
+     "script-src 'self' 'unsafe-inline' 'unsafe-eval'; child-src 'self';";
+--- a/extensions/common/manifest_handlers/shared_module_info.cc
++++ b/extensions/common/manifest_handlers/shared_module_info.cc
+@@ -22,11 +22,11 @@
+ #include "extensions/common/permissions/permission_set.h"
+ #include "extensions/common/permissions/permissions_data.h"
+ 
+-namespace extensions {
++namespace keys = extensions::manifest_keys;
++namespace values = extensions::manifest_values;
++namespace errors = extensions::manifest_errors;
+ 
+-namespace keys = manifest_keys;
+-namespace values = manifest_values;
+-namespace errors = manifest_errors;
++namespace extensions {
+ 
+ namespace {
+