diff --git a/Makefile b/Makefile
index 2e8288b..f4e29a1 100755
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,11 @@ CONFIG_REDUCE_TX_CPU_LOADING = n
 CONFIG_BR_EXT = y
 CONFIG_TDLS = n
 CONFIG_WIFI_MONITOR = y
+# If you are setting up AP (e.g. by hostapd) in 802.11ac mode, you may have to choose 'y' below.
+# Otherwise some channels may be  flagged 'NO-IR' (i.e. Passive scanning) by the driver.
+# Please check your country's regulatory domain first,
+# to see whether active scanning is permitted by law/regulations on the desired channels.
+CONFIG_DISABLE_REGD_C=y
 CONFIG_MCC_MODE = n
 CONFIG_APPEND_VENDOR_IE_ENABLE = n
 CONFIG_RTW_NAPI = y
@@ -159,6 +164,10 @@ CONFIG_DRVEXT_MODULE = n
 export TopDIR ?= $(shell pwd)
 
 ########### COMMON  #################################
+ifeq ($(CONFIG_DISABLE_REGD_C), y)
+EXTRA_CFLAGS += -DCONFIG_DISABLE_REGD_C
+endif
+
 ifeq ($(CONFIG_GSPI_HCI), y)
 HCI_NAME = gspi
 endif
diff --git a/kimocoder_Changelog.txt b/kimocoder_Changelog.txt
index fdf1021..1dfd24e 100644
--- a/kimocoder_Changelog.txt
+++ b/kimocoder_Changelog.txt
@@ -29,7 +29,13 @@
   - Enabled monitor mode
   - Parse radiotap headers for proper frame injection
   - RadioTap iterator from kernel 4.9 was added due to VHT field bug in kernels before 4.6
+  - Disabled DFS
+  - Enable DBG_TX_POWER_IDX and DBG_PG_TXPWR_READ, added extra logging for these
+  - Disabled AP mode channel switching due to DFS checks
   - Tweaked & optimized Makefile to compile with all cores available. Decreasing the compile time.
+  - Added switch to turn ON/OFF regdomain settings (Makefile)
+  - Added ODROID-C2 support
+  - Added 2 more VID/PID's
   - Fixed dkms.conf and added dkms-install.sh and dkms-remove.sh
   - Cleaned up some files & execution permissions.
 
diff --git a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
index 1edbcae..73025cc 100644
--- a/os_dep/linux/wifi_regd.c
+++ b/os_dep/linux/wifi_regd.c
@@ -529,6 +529,7 @@ static struct country_code_to_enum_rd *_rtw_regd_find_country(u16 countrycode)
 
 int rtw_regd_init(_adapter *padapter)
 {
+#ifndef CONFIG_DISABLE_REGD_C
 	struct wiphy *wiphy = padapter->rtw_wdev->wiphy;
 
 #if 0
@@ -547,7 +548,7 @@ int rtw_regd_init(_adapter *padapter)
 #endif
 
 	_rtw_regd_init_wiphy(NULL, wiphy);
-
+#endif
 	return 0;
 }
 #endif /* CONFIG_IOCTL_CFG80211 */