diff --git a/README.md b/README.md
index 718adcd8d856590af7f2e9438974b79a3ec4152c..b922f772b07f7791108c365272a8552df05dd292 100644
--- a/README.md
+++ b/README.md
@@ -119,11 +119,11 @@ target you will use in the end.
 ```bash
 $ sudo apt-get install android-tools-adb android-tools-fastboot autoconf \
 	automake bc bison build-essential cscope curl device-tree-compiler flex \
-	ftp-upload gdisk libattr1-dev libc6:i386 libcap-dev libfdt-dev libftdi-dev \
-	libglib2.0-dev libhidapi-dev libncurses5-dev libpixman-1-dev \
-	libssl-dev libstdc++6:i386 libtool libz1:i386 make mtools netcat \
-	python-crypto python-serial python-wand unzip uuid-dev xdg-utils \
-	xterm xz-utils zlib1g-dev
+	ftp-upload gdisk iasl libattr1-dev libc6:i386 libcap-dev libfdt-dev \
+	libftdi-dev libglib2.0-dev libhidapi-dev libncurses5-dev \
+	libpixman-1-dev libssl-dev libstdc++6:i386 libtool libz1:i386 make \
+	mtools netcat python-crypto python-serial python-wand unzip uuid-dev \
+	xdg-utils xterm xz-utils zlib1g-dev
 ```
 
 ## 7.2 Install Android repo
diff --git a/common.mk b/common.mk
index 4f43185e124547480da1971b6eb5f124d583f952..8d08228e6706fb9616560e10140bac64dce2bd44 100644
--- a/common.mk
+++ b/common.mk
@@ -2,6 +2,7 @@
 # Common definition to all platforms
 #
 
+SHELL := bash
 BASH ?= bash
 ROOT ?= $(shell pwd)/..
 
@@ -175,15 +176,15 @@ linux-cleaner-common: linux-defconfig-clean
 # Make sure edksetup.sh only will be called once and that we don't rebuild
 # BaseTools again and again.
 $(EDK2_PATH)/Conf/target.txt:
-	set -e && cd $(EDK2_PATH) && $(BASH) edksetup.sh && \
+	set -e && cd $(EDK2_PATH) && source edksetup.sh && \
 	$(MAKE) -j1 -C $(EDK2_PATH)/BaseTools
 
 edk2-common: $(EDK2_PATH)/Conf/target.txt
-	set -e && cd $(EDK2_PATH) && $(BASH) edksetup.sh && \
+	set -e && cd $(EDK2_PATH) && source edksetup.sh && \
 	$(call edk2-call)
 
 edk2-clean-common:
-	set -e && cd $(EDK2_PATH) && $(BASH) edksetup.sh && \
+	set -e && cd $(EDK2_PATH) && source edksetup.sh && \
 	$(call edk2-call) clean && \
 	$(MAKE) -j1 -C $(EDK2_PATH)/BaseTools clean && \
 	rm -f $(EDK2_PATH)/Conf/target.txt