diff --git a/enable_localaccount.sh b/enable_localaccount.sh
deleted file mode 100755
index 2232551977..0000000000
--- a/enable_localaccount.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2010 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.
-set -e
-
-if [ -z $1 ]; then
-  echo "Usage: $0 localaccount_username [chroot_path]"
-  exit 1
-fi
-
-# Default chroot_path to its standard location
-chroot_path=${2:-"../../chroot"}
-
-echo "Enabling local account $1@gmail.com."
-
-# Add CHROMEOS_LOCAL_ACCOUNT var to /etc/make.conf.user
-echo "Setting CHROMEOS_LOCAL_ACCOUNT in $chroot_path/etc/make.conf.user..."
-VAR_NAME=CHROMEOS_LOCAL_ACCOUNT
-if grep -q ${VAR_NAME} $chroot_path/etc/make.conf.user; then
-   regex="s/${VAR_NAME}=.*/${VAR_NAME}=$1@gmail.com/"
-   sudo sed -i -e "${regex}"  $chroot_path/etc/make.conf.user
-else
-   sudo sh -c "echo ""${VAR_NAME}=$1@gmail.com"" >> \
-               $chroot_path/etc/make.conf.user"
-fi
diff --git a/setup_board b/setup_board
index 52ba61230b..a0191e4e19 100755
--- a/setup_board
+++ b/setup_board
@@ -319,9 +319,8 @@ if ! ${HOST_BOARD}; then
 fi
 # Setup make.globals and the profile.
 cmds=(
-  "touch /etc/make.conf.user"
-  "ln -sf /etc/make.globals '${BOARD_ROOT}/etc/make.globals'"
-  "ln -sf /etc/make.conf.user '${BOARD_ROOT}/etc/make.conf.user'"
+  "touch /etc/portage/make.conf.user"
+  "ln -sf /etc/portage/make.conf.user '${BOARD_ROOT}/etc/make.conf.user'"
   "mkdir -p '${BOARD_ROOT}/etc/portage/hooks'"
 )
 for d in "${SCRIPTS_DIR}"/hooks/*; do