diff --git a/Makefile b/Makefile
index 527b74e..5a1415e 100755
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ EXTRA_CFLAGS += -I$(src)/hal/phydm
 CONFIG_AUTOCFG_CP = n
 
 ########################## WIFI IC ############################
-CONFIG_RTL8188E = y
+CONFIG_RTL8188EU = m
 ######################### Interface ###########################
 CONFIG_USB_HCI = y
 ########################## Features ###########################
@@ -82,7 +82,7 @@ CONFIG_PLATFORM_I386_PC = y
 
 CONFIG_DRVEXT_MODULE = n
 
-export TopDIR ?= $(shell pwd)
+export TopDIR ?= $(CURDIR)
 
 MSG="Directory .git does not exist indicating that you downloaded the source as a zip file. Only the 'git clone' method is now supported."
 
@@ -152,8 +152,6 @@ EXTRA_CFLAGS += -I$(src)/hal/btc
 
 RTL871X = rtl8188e
 
-EXTRA_CFLAGS += -DCONFIG_RTL8188E
-
 _HAL_INTFS_FILES +=	hal/HalPwrSeqCmd.o \
 					hal/Hal8188EPwrSeq.o\
  					hal/$(RTL871X)_xmit.o\
@@ -472,15 +470,13 @@ obj-$(CONFIG_RTL8188EU) := 8188eu.o
 
 else
 
-export CONFIG_RTL8188EU = m
-
 all: test modules
 
 test:
 	@if [ !  -e  ./.git ] ; then echo $(MSG); exit 1; fi;
 
 modules:
-	$(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(shell pwd)  modules
+	$(MAKE) ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) -C $(KSRC) M=$(CURDIR)  modules
 
 strip:
 	$(CROSS_COMPILE)strip 8188eu.ko --strip-unneeded
@@ -501,7 +497,7 @@ config_r:
 .PHONY: modules clean
 
 clean:
-	#$(MAKE) -C $(KSRC) M=$(shell pwd) clean
+	#$(MAKE) -C $(KSRC) M=$(CURDIR) clean
 	cd hal ; rm -fr */*/*/*.mod.c */*/*/*.mod */*/*/*.o */*/*/.*.cmd */*/*/*.ko
 	cd hal ; rm -fr */*/*.mod.c */*/*.mod */*/*.o */*/.*.cmd */*/*.ko
 	cd hal ; rm -fr */*.mod.c */*.mod */*.o */.*.cmd */*.ko