diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults
index af9832a410..cac1c05562 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults
@@ -142,6 +142,9 @@ USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE"
 # Previously defined in make.conf
 USE="${USE} hardened cros_host pic pie expat -introspection -cups -openrc"
 
+# Enable bindist for both SDK and targets
+USE="${USE} bindist"
+
 # Default licenses that are accepted for ChromiumOS builds.
 # If you want to accept more, use the --accept_licenses flag
 # when running setup_board.
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults
index 19221eb07a..288a5915c4 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults
@@ -1,7 +1,7 @@
 # Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-USE="bindist cros-debug acpi usb pam"
+USE="cros-debug acpi usb pam"
 USE="${USE} -cros_host -expat -pic -pie -cairo -X"
 USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512"
 USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask
index 3023e13059..1b9fce6201 100644
--- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask
@@ -1,11 +1,6 @@
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Distributed under the terms of the GNU General Public License v2
 
-# Brian Stell <bstell@chromium.org> (27 August 2010)
-# For Chromium OS enable FreeType sub-pixel anti-aliasing and bytecode
-# interpreter
-media-libs/freetype bindist
-
 # Jungshik Shin <jshin@chromium.org) (31 August 2010)
 # We don't want to generate fonts.scale when installing fonts with font.eclass
 # ( http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/eclass/font.eclass?revision=1.50&view=markup )