diff --git a/envsetup.sh b/envsetup.sh
index 57d461b..4ba9d17 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -29,7 +29,9 @@
 export ROOT_DIR=$PWD
 
 export BUILD_CONFIG=${BUILD_CONFIG:-build.config}
+set -a
 . ${ROOT_DIR}/${BUILD_CONFIG}
+set +a
 
 export COMMON_OUT_DIR=$(readlink -m ${OUT_DIR:-${ROOT_DIR}/out/${BRANCH}})
 export OUT_DIR=$(readlink -m ${COMMON_OUT_DIR}/${KERNEL_DIR})
@@ -65,8 +67,6 @@
 echo "PATH=${PATH}"
 echo
 
-export $(sed -n -e 's/\([^=]\)=.*/\1/p' ${ROOT_DIR}/${BUILD_CONFIG})
-
 # verifies that defconfig matches the DEFCONFIG
 function check_defconfig() {
     (cd ${OUT_DIR} && \