diff --git a/packages/linux/modprobe.d/ath9k.conf b/packages/linux/modprobe.d/ath9k.conf
deleted file mode 100644
index e10b4ce285..0000000000
--- a/packages/linux/modprobe.d/ath9k.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/modprobe.d/ath9k.conf: setup modload options for module ath9k.
-# see:
-# http://openelec.tv/forum/28-issue-reports/4644-addons-download-not-working#4778
-
-options ath9k nohwcrypt=1
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index 8952cd6707..4d81425685 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -1955,7 +1955,7 @@ CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DYNACK is not set
 # CONFIG_ATH9K_WOW is not set
 CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
diff --git a/projects/Generic/packages/linux/modprobe.d/ath9k.conf b/projects/Generic/packages/linux/modprobe.d/ath9k.conf
new file mode 100644
index 0000000000..608c4b6570
--- /dev/null
+++ b/projects/Generic/packages/linux/modprobe.d/ath9k.conf
@@ -0,0 +1,5 @@
+# ath9k.conf: setup modload options for module ath9k.
+#
+# enable "Channel Context support" to avoid buffering in live TV
+
+options ath9k use_chanctx=1
diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf
index 230735f44e..bb557c0c49 100644
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@@ -1442,7 +1442,7 @@ CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DYNACK is not set
 # CONFIG_ATH9K_WOW is not set
 CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf
index b5cd97c939..101009a002 100644
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@@ -1535,7 +1535,7 @@ CONFIG_ATH9K_AHB=y
 # CONFIG_ATH9K_DYNACK is not set
 # CONFIG_ATH9K_WOW is not set
 CONFIG_ATH9K_RFKILL=y
-# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
 CONFIG_ATH9K_PCOEM=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
diff --git a/projects/RPi/packages/linux/modprobe.d/ath9k.conf b/projects/RPi/packages/linux/modprobe.d/ath9k.conf
new file mode 100644
index 0000000000..608c4b6570
--- /dev/null
+++ b/projects/RPi/packages/linux/modprobe.d/ath9k.conf
@@ -0,0 +1,5 @@
+# ath9k.conf: setup modload options for module ath9k.
+#
+# enable "Channel Context support" to avoid buffering in live TV
+
+options ath9k use_chanctx=1