diff --git a/kernel/drivers/module-bbswitch/pspec.xml b/kernel/drivers/module-bbswitch/pspec.xml
index e5894073..fa975f61 100644
--- a/kernel/drivers/module-bbswitch/pspec.xml
+++ b/kernel/drivers/module-bbswitch/pspec.xml
@@ -13,7 +13,7 @@
         <Summary>Kernel module allowing to switch dedicated graphics card on Optimus laptops</Summary>
         <Description>kernel module allowing to switch dedicated graphics card on Optimus laptops</Description>
         <BuildDependencies>
-            <Dependency version="4.9.86">kernel-module-headers</Dependency>
+            <Dependency version="4.9.96">kernel-module-headers</Dependency>
         </BuildDependencies>
         <Archive sha1sum="e282ee682d794e3962baa4dead01917c42571e78" type="targz">https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz</Archive>
         <Patches>
@@ -22,7 +22,7 @@
     <Package>
         <Name>module-bbswitch</Name>
         <RuntimeDependencies>
-            <Dependency version="4.9.86">kernel</Dependency>
+            <Dependency version="4.9.96">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -36,6 +36,13 @@
     </Package>
 
     <History>
+        <Update release="17">
+            <Date>2018-04-28</Date>
+            <Version>0.8</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="16">
             <Date>2018-03-11</Date>
             <Version>0.8</Version>
diff --git a/kernel/drivers/module-broadcom-wl/pspec.xml b/kernel/drivers/module-broadcom-wl/pspec.xml
index e70e7fda..19d6fd08 100644
--- a/kernel/drivers/module-broadcom-wl/pspec.xml
+++ b/kernel/drivers/module-broadcom-wl/pspec.xml
@@ -15,7 +15,7 @@
         <Archive sha1sum="8acbdbb4ab4ab4123d1773b616904798fbef9277" type="targz" target="i686">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
         <Archive sha1sum="1f568bb989d175813c5631c6629d9479eae6f3be" type="targz" target="x86_64">https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz</Archive>
         <BuildDependencies>
-            <Dependency version="4.9.86">kernel-module-headers</Dependency>
+            <Dependency version="4.9.96">kernel-module-headers</Dependency>
         </BuildDependencies>
         <Patches>
             <Patch level="1">patch/license.patch</Patch>
@@ -28,7 +28,7 @@
     <Package>
         <Name>module-broadcom-wl</Name>
         <RuntimeDependencies>
-            <Dependency version="4.9.86">kernel</Dependency>
+            <Dependency version="4.9.96">kernel</Dependency>
             <Dependency release="current">module-broadcom-wl-userspace</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -57,6 +57,13 @@
     </Package>
 
     <History>
+        <Update release="17">
+            <Date>2018-04-28</Date>
+            <Version>6.30.223.271</Version>
+            <Comment>Rebuild for new kernel</Comment>
+            <Name>Kamil Atlı</Name>
+            <Email>suvari@pisilinux.org</Email>
+        </Update>
         <Update release="16">
             <Date>2018-03-11</Date>
             <Version>6.30.223.271</Version>
diff --git a/kernel/drivers/module-virtualbox-guest/pspec.xml b/kernel/drivers/module-virtualbox-guest/pspec.xml
index 5241870f..278abef4 100644
--- a/kernel/drivers/module-virtualbox-guest/pspec.xml
+++ b/kernel/drivers/module-virtualbox-guest/pspec.xml
@@ -14,14 +14,14 @@
         <Description>This package provides the kernel modules needed for mouse integration and shared folder support between VirtualBox host and guest systems.</Description>
         <Archive sha1sum="59f4821a29bee9d8beb282c424007e71d1cbcdf5" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-guest-5.2.10.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency version="4.9.86">kernel-module-headers</Dependency>
+            <Dependency version="4.9.96">kernel-module-headers</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>module-virtualbox-guest</Name>
         <RuntimeDependencies>
-            <Dependency version="4.9.86">kernel</Dependency>
+            <Dependency version="4.9.96">kernel</Dependency>
             <Dependency>baselayout</Dependency>
             <Dependency version="current">module-virtualbox-guest-userspace</Dependency>
         </RuntimeDependencies>
@@ -52,6 +52,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2018-04-28</Date>
+            <Version>5.2.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2018-04-18</Date>
             <Version>5.2.10</Version>
diff --git a/kernel/drivers/module-virtualbox/pspec.xml b/kernel/drivers/module-virtualbox/pspec.xml
index 4d4c7cd3..aba451d2 100644
--- a/kernel/drivers/module-virtualbox/pspec.xml
+++ b/kernel/drivers/module-virtualbox/pspec.xml
@@ -14,7 +14,7 @@
         <Description>This package provides the kernel support for VirtualBox.</Description>
         <Archive sha1sum="d50a1fd9c81c7e80830e908d5e16250d74b467a2" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/module-virtualbox-5.2.10.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency version="4.9.86">kernel-module-headers</Dependency>
+            <Dependency version="4.9.96">kernel-module-headers</Dependency>
         </BuildDependencies>
         <!--Patches>
             <Patch>vbox_linux-4.3.diff</Patch>
@@ -24,7 +24,7 @@
     <Package>
         <Name>module-virtualbox</Name>
         <RuntimeDependencies>
-            <Dependency version="4.9.86">kernel</Dependency>
+            <Dependency version="4.9.96">kernel</Dependency>
             <Dependency version="current">module-virtualbox-userspace</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="26">
+            <Date>2018-04-28</Date>
+            <Version>5.2.10</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="25">
             <Date>2018-04-18</Date>
             <Version>5.2.10</Version>
diff --git a/kernel/drivers/ndiswrapper/pspec.xml b/kernel/drivers/ndiswrapper/pspec.xml
index 6c337e30..bb4c7679 100644
--- a/kernel/drivers/ndiswrapper/pspec.xml
+++ b/kernel/drivers/ndiswrapper/pspec.xml
@@ -15,17 +15,16 @@
         <Description>module-ndiswrapper allows you to use Windows XP drivers for WLAN cards without proper Linux drivers.</Description>
         <Archive sha1sum="213854ca8a83f9b5972db8fa873d346124e4bcb5" type="targz">http://download.sourceforge.net/ndiswrapper/ndiswrapper-1.61.tar.gz</Archive>
         <BuildDependencies>
-             <Dependency version="4.9.86">kernel-module-headers</Dependency>
+             <Dependency version="4.9.96">kernel-module-headers</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch>upstream.patch</Patch> -->
         </Patches>
     </Source>
 
     <Package>
         <Name>ndiswrapper</Name>
         <RuntimeDependencies>
-            <Dependency version="4.9.86">kernel</Dependency>
+            <Dependency version="4.9.96">kernel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -41,6 +40,13 @@
     </Package>
 
     <History>
+        <Update release="16">
+            <Date>2018-04-28</Date>
+            <Version>1.61</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="15">
             <Date>2018-03-11</Date>
             <Version>1.61</Version>
diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config
index 33867e4e..3c937a62 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.9.86 Kernel Configuration
+# Linux/x86_64 4.9.96 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/kernel/kernel/files/patches/linux/patch-4.9.96.xz b/kernel/kernel/files/patches/linux/patch-4.9.96.xz
new file mode 100644
index 00000000..6abfaba2
Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.9.96.xz differ
diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml
index 365e719c..dc9bebaf 100644
--- a/kernel/kernel/pspec.xml
+++ b/kernel/kernel/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>kernel</IsA>
         <Summary>The Linux kernel (the core of the Linux operating system) for Pisi Linux</Summary>
         <Description>kernel contains the Linux kernel, the core of any Linux operating system. The kernel handles the basic functions of the operating system: memory allocation, process allocation, device input and output, etc.</Description>
-        <Archive sha1sum="dfbfc35cf99dbcf6c318ddc1e7d6788fa8a756da" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.gz</Archive>
+        <Archive sha1sum="60a47e858fce153c5bedd7e293a1b45e8d2db054" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.gz</Archive>
         <AdditionalFiles>
             <AdditionalFile target="configs/kernel-i686-config">configs/kernel-i686-config</AdditionalFile>
             <AdditionalFile target="configs/kernel-x86_64-config">configs/kernel-x86_64-config</AdditionalFile>
@@ -28,7 +28,7 @@
         </BuildDependencies>
         <Patches>
             <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-4.9.86.xz</Patch>
+            <Patch level="1" compressionType="xz">patches/linux/patch-4.9.96.xz</Patch>
             <!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.9.40/1.mga7/PATCHES/patches/series-->
             <!--stable patches-->
             <!--CVE-2016-8405-->
@@ -132,7 +132,7 @@
             <Patch level="1">patches/mageia/sound-ALSA-hda-Use-a-helper-function-for-renaming-kctl-nam.patch</Patch>
             <Patch level="1">patches/mageia/sound-ALSA-hda-Apply-dual-codec-quirk-for-MSI-Z270-Gaming-.patch</Patch>
             <Patch level="1">patches/mageia/sound-ALSA-hda-Fix-applying-MSI-dual-codec-mobo-quirk.patch</Patch>
-            <Patch level="1">patches/mageia/sound-ALSA-hda-Add-Geminilake-id-to-SKL_PLUS.patch</Patch>
+            
             <Patch level="1">patches/mageia/sound-ALSA-hda-Add-Coffelake-PCI-ID.patch</Patch>
             <Patch level="1">patches/mageia/sound-ALSA-hda-Apply-quirks-to-Broxton-T-too.patch</Patch>
             <Patch level="1">patches/mageia/hid-usbhid-IBM-BladeCenterHS20-quirk.patch</Patch>
@@ -223,6 +223,17 @@
     </Package>
 
     <History>
+        <Update release="18">
+            <Date>2018-04-28</Date>
+            <Version>4.9.96</Version>
+            <Comment>Version Bump</Comment>
+            <Type package="kernel">security</Type>
+            <Requires>
+                <Action package="kernel">systemRestart</Action>
+            </Requires>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="17">
             <Date>2018-03-10</Date>
             <Version>4.9.86</Version>
diff --git a/kernel/tools/cpupowertools/files/patches/linux/patch-4.9.96.xz b/kernel/tools/cpupowertools/files/patches/linux/patch-4.9.96.xz
new file mode 100644
index 00000000..6abfaba2
Binary files /dev/null and b/kernel/tools/cpupowertools/files/patches/linux/patch-4.9.96.xz differ
diff --git a/kernel/tools/cpupowertools/pspec.xml b/kernel/tools/cpupowertools/pspec.xml
index 2b13a0e1..3ab5bcf3 100644
--- a/kernel/tools/cpupowertools/pspec.xml
+++ b/kernel/tools/cpupowertools/pspec.xml
@@ -12,13 +12,13 @@
         <IsA>app:console</IsA>
         <Summary>CPU power management tools</Summary>
         <Description>cpupowertools contains utilities to manage power management and frequency scaling policies of modern CPUs.</Description>
-        <Archive sha1sum="dfbfc35cf99dbcf6c318ddc1e7d6788fa8a756da" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.gz</Archive>
+        <Archive sha1sum="60a47e858fce153c5bedd7e293a1b45e8d2db054" type="targz">https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>pciutils-devel</Dependency>
         </BuildDependencies>
-                <Patches>
+        <Patches>
             <!-- Linux patches -->
-            <Patch level="1" compressionType="xz">patches/linux/patch-4.9.86.xz</Patch>
+            <Patch level="1" compressionType="xz">patches/linux/patch-4.9.96.xz</Patch>
             <!-- Mageia Linux patches // compatible with http://svnweb.mageia.org/packages/cauldron/kernel/releases/4.9.40/1.mga7/PATCHES/patches/series-->
             <!--stable patches-->
             <!--CVE-2016-8405-->
@@ -122,7 +122,7 @@
             <Patch level="1">patches/mageia/sound-ALSA-hda-Use-a-helper-function-for-renaming-kctl-nam.patch</Patch>
             <Patch level="1">patches/mageia/sound-ALSA-hda-Apply-dual-codec-quirk-for-MSI-Z270-Gaming-.patch</Patch>
             <Patch level="1">patches/mageia/sound-ALSA-hda-Fix-applying-MSI-dual-codec-mobo-quirk.patch</Patch>
-            <Patch level="1">patches/mageia/sound-ALSA-hda-Add-Geminilake-id-to-SKL_PLUS.patch</Patch>
+            
             <Patch level="1">patches/mageia/sound-ALSA-hda-Add-Coffelake-PCI-ID.patch</Patch>
             <Patch level="1">patches/mageia/sound-ALSA-hda-Apply-quirks-to-Broxton-T-too.patch</Patch>
             <Patch level="1">patches/mageia/hid-usbhid-IBM-BladeCenterHS20-quirk.patch</Patch>