diff --git a/chroot_version_hooks.d/6_mobile_broadband_removal b/chroot_version_hooks.d/6_mobile_broadband_removal
new file mode 100644
index 0000000000..5d3806c8b3
--- /dev/null
+++ b/chroot_version_hooks.d/6_mobile_broadband_removal
@@ -0,0 +1,16 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Unmerge net-misc/mobile-broadband-provider-info because it's
+# been replaced by chromeos-base/mobile-providers.
+for board_root in /build/*; do
+  if [ -d "${board_root}" ]; then
+    board=$(basename "${board_root}")
+    CLEAN_DELAY=0 emerge-${board} \
+      --unmerge net-misc/mobile-broadband-provider-info || true
+  fi
+done
+
+info "Chroot upgraded to version 6: mobile-broadband-provider-info removed"
+exit 0