diff --git a/chroot_version_hooks.d/93_clean_make.globals b/chroot_version_hooks.d/93_clean_make.globals
new file mode 100644
index 0000000..bba579b
--- /dev/null
+++ b/chroot_version_hooks.d/93_clean_make.globals
@@ -0,0 +1,7 @@
+# Copyright 2014 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 /etc/make.globals file is no longer used, so delete old symlinks to it.
+
+exec sudo rm -f /etc/make.globals /build/*/etc/make.globals
diff --git a/setup_board b/setup_board
index d5f80d8..c0fc446 100755
--- a/setup_board
+++ b/setup_board
@@ -460,7 +460,7 @@
     install_toolchain
   fi
 fi
-# Setup make.globals and the profile.
+# Setup the profile.
 if [[ ! -s /etc/make.conf.user ]]; then
   sudo_clobber /etc/make.conf.user <<\EOF
 # This file is useful for doing global (chroot and all board) changes.
@@ -477,7 +477,6 @@
 EOF
 fi
 cmds=(
-  "ln -sf /etc/make.globals '${BOARD_ROOT}/etc/make.globals'"
   "ln -sf /etc/make.conf.user '${BOARD_ROOT}/etc/make.conf.user'"
   "mkdir -p '${BOARD_ROOT}/etc/portage/hooks'"
 )