diff --git a/chroot_version_hooks.d/23_vcs_migration b/chroot_version_hooks.d/23_vcs_migration
new file mode 100644
index 0000000000..5a2d7ff1f5
--- /dev/null
+++ b/chroot_version_hooks.d/23_vcs_migration
@@ -0,0 +1,13 @@
+# 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.
+
+# The dev-util -> dev-vcs migration isn't as smooth as we'd like due to
+# the profiles/updates/ files only applying to packages installed from
+# that overlay.  Force unmerge the old packages if they were not auto
+# migrated for the user.  See https://gerrit.chromium.org/gerrit/13148
+# for some in-depth details.
+
+sudo CLEAN_DELAY=0 emerge -C dev-util/{git,subversion} net-misc/neon
+
+exit 0