diff --git a/Makefile b/Makefile
index 2c557d7..f83c30c 100755
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ CONFIG_RTL8812A = y
 CONFIG_RTL8821A = y
 CONFIG_RTL8192E = n
 CONFIG_RTL8723B = n
-CONFIG_RTL8814A = n
+CONFIG_RTL8814A = y
 CONFIG_RTL8723C = n
 CONFIG_RTL8188F = n
 CONFIG_RTL8822B = n
@@ -196,11 +196,35 @@ ifeq ($(CONFIG_PCI_HCI), y)
 HCI_NAME = pci
 endif
 
-ifeq ($(RTL8814), 1)
-CONFIG_RTL8812A = y
-CONFIG_RTL8821A = y
-CONFIG_RTL8814A = y
+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
+
+EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\"
+ifeq ($(CONFIG_USB_HCI), y)
+USER_MODULE_NAME = 88XXau
 endif
+ifeq ($(CONFIG_PCI_HCI), y)
+USER_MODULE_NAME = 88XXae
+endif
+ifeq ($(CONFIG_SDIO_HCI), y)
+USER_MODULE_NAME = 88XXas
+endif
+
+else
+EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\"
+endif
+
+
+#ifeq ($(RTL8814), 1)
+#CONFIG_RTL8812A = n
+#CONFIG_RTL8821A = n
+#CONFIG_RTL8814A = y
+#endif
+
+#ifeq ($(RTL8821), 1)
+#CONFIG_RTL8812A = y
+#CONFIG_RTL8821A = y
+#CONFIG_RTL8814A = n
+#endif
 
 ifeq ($(CONFIG_USB2_EXTERNAL_POWER), y)
 EXTRA_CFLAGS += -DCONFIG_USE_EXTERNAL_POWER
@@ -1003,6 +1027,9 @@ endif
 
 ifeq ($(CONFIG_LED_CONTROL), y)
 EXTRA_CFLAGS += -DCONFIG_LED_CONTROL
+ifeq ($(RTL8814), 1)
+EXTRA_CFLAGS += -DCONFIG_SW_LED -DCONFIG_RTW_SW_LED
+endif
 ifeq ($(CONFIG_LED_ENABLE), y)
 EXTRA_CFLAGS += -DCONFIG_LED_ENABLE
 endif
diff --git a/include/autoconf.h b/include/autoconf.h
index af0b95d..bc57c41 100644
--- a/include/autoconf.h
+++ b/include/autoconf.h
@@ -22,7 +22,7 @@
  */
 #define AUTOCONF_INCLUDED
 #define RTL871X_MODULE_NAME "8812AU"
-#define DRV_NAME "rtl8812au"
+//#define DRV_NAME "rtl8812au"
 
 
 #define CONFIG_USB_HCI