diff --git a/chroot_version_hooks.d/32_scrub_old_pkgs b/chroot_version_hooks.d/32_scrub_old_pkgs
new file mode 100644
index 0000000000..88f8573061
--- /dev/null
+++ b/chroot_version_hooks.d/32_scrub_old_pkgs
@@ -0,0 +1,28 @@
+# Copyright (c) 2012 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.
+
+# We've been migrating packages of late, so make sure the old stuff gets
+# cleaned out.
+
+pkgs=(
+  dev-util/cvs
+  dev-util/cvsps
+  dev-util/git
+  dev-util/subversion
+  '<=media-libs/jpeg-6b-r9:62'
+  '<media-libs/libpng-1.2.45-r2:1.2'
+  net-misc/neon
+  sys-apps/parted
+)
+
+for board_root in /build/* ; do
+  board=${board_root##*/}
+  emerge_board=$(type -P emerge-${board} 2>/dev/null || true)
+  if [[ -x "${emerge_board}" ]]; then
+    CLEAN_DELAY=0 ${emerge_board} -q --unmerge "${pkgs[@]}" || true
+    eclean-${board} -d packages || true
+  fi
+done
+
+exit 0