diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config
index 32e72208..4776cea4 100644
--- a/kernel/kernel/files/configs/kernel-x86_64-config
+++ b/kernel/kernel/files/configs/kernel-x86_64-config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 4.8.2 Kernel Configuration
+# Linux/x86_64 4.8.4 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -369,6 +369,8 @@ CONFIG_IOSCHED_NOOP=y
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
+CONFIG_IOSCHED_BFQ=m
+# CONFIG_BFQ_GROUP_IOSCHED is not set
 CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
diff --git a/kernel/kernel/files/patches/mageia/series b/kernel/kernel/files/patches/mageia/series
index 1eff6fc4..8906ee33 100644
--- a/kernel/kernel/files/patches/mageia/series
+++ b/kernel/kernel/files/patches/mageia/series
@@ -46,6 +46,8 @@ Revert-x86-mm-mtrr-Remove-kernel-internal-MTRR-inter.patch
 ###
 base-cacheinfo-silence-DT-warnings.patch
 
+kernel-sched-fair-Fix-incorrect-task-group-load_avg.patch
+
 ###
 ### i2c
 ###
@@ -121,10 +123,15 @@ block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch
 
 # Include new BFQ I/O scheduler
 # (See http://algo.ing.unimo.it/people/paolo/disk_sched)
-# DISABLED: 0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0.patch
-# DISABLED: 0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0.patch
-# DISABLED: 0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch
-# DISABLED: 0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r3-for.patch
+# 
+# Release of BFQ I/O scheduler v8r4 (rediffed from git https://github.com/linusw/linux-bfq)
+linux-BFQ-v8r4.patch
+
+# Let NVME drives enter in power state
+# (see https://github.com/damige/linux-nvme/tree/master/src)
+nvmepatch1-V4.patch
+nvmepatch2-V4.patch
+nvmepatch3-V4.patch
 
 ###
 ### Char
@@ -175,6 +182,14 @@ gpu-drm-mach64-linux-3.14-buildfix.patch
 gpu-drm-mach64-3.17-buildfix.patch
 gpu-drm-mach64-3.18-buildfix.patch
 
+# Attempt to fix FIFO underrun problems:
+# (from https://patchwork.freedesktop.org/patch/113642/ and 
+# from https://bugs.freedesktop.org/attachment.cgi?id=127264, reference from
+# https://bugs.freedesktop.org/show_bug.cgi?id=97450). Does not completely resolve the
+# issues but reduce.
+drm-i915-gen9-fix-DDB-partitioning-for-multi-screen-cases.patch
+skl_uncondition_memory_bandwitdth_WA_n_adjusted_mode_in_SAGV_check_on_a7fac751ddba.patch
+
 ###
 ### Hardware Monitoring
 ###
@@ -226,6 +241,12 @@ net-netfilter-psd.patch
 net-netfilter-psd-mdv.patch
 net-netfilter-psd-2.6.35-buildfix.patch
 
+# rtlwifi regression
+net-wireless-rtlwifi-Fix-regression-caused-by-commit-d86e64768859.patch
+
+# CVE-2016-7039
+net-add-recursion-limit-to-GRO.patch
+
 ###
 ### Platform drivers
 ###
diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml
index c1c1040a..09eda125 100644
--- a/kernel/kernel/pspec.xml
+++ b/kernel/kernel/pspec.xml
@@ -28,8 +28,8 @@
         </BuildDependencies>
         <Patches>
             <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-4.8.2.xz</Patch>
-            <!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.8.2/1.mga6/PATCHES/patches/series-->
+            <Patch level="1" compressionType="xz">patches/linux/patch-4.8.4.xz</Patch>
+            <!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.8.4/1.mga6/PATCHES/patches/series-->
             <!--stable patches-->
             <!--other patches-->
             <Patch level="1">patches/mageia/Revert-ipmi-Start-the-timer-and-thread-on-internal-m.patch</Patch>
@@ -40,6 +40,7 @@
             <Patch level="1">patches/mageia/Revert-cpufreq-pcc-Enable-autoload-of-pcc-cpufreq-fo.patch</Patch>
             <Patch level="1">patches/mageia/Revert-x86-mm-mtrr-Remove-kernel-internal-MTRR-inter.patch</Patch>
             <Patch level="1">patches/mageia/base-cacheinfo-silence-DT-warnings.patch</Patch>
+            <Patch level="1">patches/mageia/kernel-sched-fair-Fix-incorrect-task-group-load_avg.patch</Patch>            
             <Patch level="1">patches/mageia/pci-add-ALI-M5229-ide-compatibility-mode-quirk.patch</Patch>
             <Patch level="1">patches/mageia/pci-quirks-drop-devinit-exit.patch</Patch>
             <Patch level="1">patches/mageia/acpi-CLEVO-M360S-disable_acpi_irq.patch</Patch>
@@ -58,6 +59,10 @@
             <Patch level="1">patches/mageia/block-floppy-disable-pnp-modalias.patch</Patch>
             <Patch level="1">patches/mageia/ata-prefer-ata-drivers-over-ide-drivers-when-both-are-built.patch</Patch>
             <Patch level="1">patches/mageia/block-Make-CFQ-default-to-IOPS-mode-on-SSDs.patch</Patch>
+            <Patch level="1">patches/mageia/linux-BFQ-v8r4.patch</Patch>
+            <Patch level="1">patches/mageia/nvmepatch1-V4.patch</Patch>
+            <Patch level="1">patches/mageia/nvmepatch2-V4.patch</Patch>
+            <Patch level="1">patches/mageia/nvmepatch3-V4.patch</Patch>            
             <Patch level="1">patches/mageia/fs-aufs-4.7.patch</Patch>
             <Patch level="1">patches/mageia/fs-aufs-4.7-modular.patch</Patch>
             <Patch level="1">patches/mageia/fs-aufs-4.7-ver-fix.patch</Patch>
@@ -81,6 +86,8 @@
             <Patch level="1">patches/mageia/gpu-drm-mach64-linux-3.14-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.17-buildfix.patch</Patch>
             <Patch level="1">patches/mageia/gpu-drm-mach64-3.18-buildfix.patch</Patch--><!--1-->
+            <Patch level="1">patches/mageia/drm-i915-gen9-fix-DDB-partitioning-for-multi-screen-cases.patch</Patch>
+            <Patch level="1">patches/mageia/skl_uncondition_memory_bandwitdth_WA_n_adjusted_mode_in_SAGV_check_on_a7fac751ddba.patch</Patch>           
             <Patch level="1">patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch</Patch>
             <Patch level="1">patches/mageia/net-sis190-fix-list-usage.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-IFWLOG.patch</Patch>
@@ -93,6 +100,8 @@
             <Patch level="1">patches/mageia/net-netfilter-psd.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-psd-mdv.patch</Patch>
             <Patch level="1">patches/mageia/net-netfilter-psd-2.6.35-buildfix.patch</Patch>
+            <Patch level="1">patches/mageia/net-wireless-rtlwifi-Fix-regression-caused-by-commit-d86e64768859.patch</Patch>
+            <Patch level="1">patches/mageia/net-add-recursion-limit-to-GRO.patch</Patch>
             <Patch level="1">patches/mageia/platform-x86-add-shuttle-wmi-driver.patch</Patch>
             <Patch level="1">patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch</Patch>
             <Patch level="1">patches/mageia/platform-x86-shuttle-wmi-4.2-buildfix.patch</Patch>
@@ -187,8 +196,8 @@
 
     <History>
         <Update release="7">
-            <Date>2016-10-18</Date>
-            <Version>4.8.2</Version>
+            <Date>2016-10-28</Date>
+            <Version>4.8.4</Version>
             <Comment>Version Bump.</Comment>
             <Type package="kernel">security</Type>
             <Requires>