diff --git a/pisi-index.xml b/pisi-index.xml
index 3c107e4c..91f00e6e 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -561,7 +561,7 @@
                 <Dependency>xmlto</Dependency>
             </BuildDependencies>
             <Patches>
-                <Patch compressionType="xz" level="1">patches/linux/patch-4.0.6.xz</Patch>
+                <Patch compressionType="xz" level="1">patches/linux/patch-4.0.7.xz</Patch>
                 <Patch level="1">patches/pisilinux_aufs4-standalone.patch</Patch>
             </Patches>
             <SourceURI>kernel/kernel/pspec.xml</SourceURI>
@@ -621,6 +621,14 @@
             </Files>
         </Package>
         <History>
+            <Update release="54">
+                <Type package="kernel">security</Type>
+                <Date>2015-06-30</Date>
+                <Version>4.0.7</Version>
+                <Comment>Version bump to 4.0.7 https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.7</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="53">
                 <Type package="kernel">security</Type>
                 <Date>2015-06-23</Date>
@@ -1311,7 +1319,7 @@
                 <Dependency>pciutils-devel</Dependency>
             </BuildDependencies>
             <Patches>
-                <Patch compressionType="xz" level="1">patches/linux/patch-4.0.6.xz</Patch>
+                <Patch compressionType="xz" level="1">patches/linux/patch-4.0.7.xz</Patch>
             </Patches>
             <SourceURI>kernel/tools/cpupowertools/pspec.xml</SourceURI>
         </Source>
@@ -1334,6 +1342,13 @@
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="53">
+                <Date>2015-06-30</Date>
+                <Version>4.0.7</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="52">
                 <Date>2015-06-24</Date>
                 <Version>4.0.6</Version>
@@ -1894,7 +1909,7 @@
             <Description xml:lang="en">This package provides the kernel support for VirtualBox.</Description>
             <Archive type="tarxz" sha1sum="8850ebc24e00640835b682a5f8bbc8f05313d2d7">http://source.pisilinux.org/1.0/module-virtualbox-4.3.28.tar.xz</Archive>
             <BuildDependencies>
-                <Dependency version="4.0.6">kernel-module-headers</Dependency>
+                <Dependency version="4.0.7">kernel-module-headers</Dependency>
             </BuildDependencies>
             <SourceURI>kernel/drivers/module-virtualbox/pspec.xml</SourceURI>
         </Source>
@@ -1904,7 +1919,7 @@
                 <Flag>noDelta</Flag>
             </BuildFlags>
             <RuntimeDependencies>
-                <Dependency version="4.0.6">kernel</Dependency>
+                <Dependency version="4.0.7">kernel</Dependency>
                 <Dependency version="4.3.28">module-virtualbox-userspace</Dependency>
             </RuntimeDependencies>
             <Files>
@@ -1926,6 +1941,13 @@
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="46">
+                <Date>2015-06-30</Date>
+                <Version>4.3.28</Version>
+                <Comment>Rebuild for kernel-4.0.7.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="45">
                 <Date>2015-06-24</Date>
                 <Version>4.3.28</Version>
@@ -2267,14 +2289,14 @@
             <Description xml:lang="tr">Eski ve yeni optimus teknolojisine sahip dizüstü bilgisyarlarda çalışabilmektedir.</Description>
             <Archive type="targz" sha1sum="e282ee682d794e3962baa4dead01917c42571e78">https://github.com/Bumblebee-Project/bbswitch/archive/v0.8.tar.gz</Archive>
             <BuildDependencies>
-                <Dependency version="4.0.6">kernel-module-headers</Dependency>
+                <Dependency version="4.0.7">kernel-module-headers</Dependency>
             </BuildDependencies>
             <SourceURI>kernel/drivers/module-bbswitch/pspec.xml</SourceURI>
         </Source>
         <Package>
             <Name>module-bbswitch</Name>
             <RuntimeDependencies>
-                <Dependency version="4.0.6">kernel</Dependency>
+                <Dependency version="4.0.7">kernel</Dependency>
             </RuntimeDependencies>
             <Files>
                 <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -2287,6 +2309,13 @@
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="22">
+                <Date>2015-06-30</Date>
+                <Version>0.8</Version>
+                <Comment>Rebuild for kernel-4.0.7.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="21">
                 <Date>2015-06-24</Date>
                 <Version>0.8</Version>
@@ -2460,7 +2489,7 @@
             <Description xml:lang="tr">Bu paket VirtualBox sunucu makinesi ile misafir sistemler arası fare entegrasyonu ve paylaşımlı dizin desteği için gerekli çekirdek modüllerini içerir.</Description>
             <Archive type="tarxz" sha1sum="82194515516139801fdc690198495b043d1c9cbe">http://source.pisilinux.org/1.0/module-virtualbox-guest-4.3.28.tar.xz</Archive>
             <BuildDependencies>
-                <Dependency version="4.0.6">kernel-module-headers</Dependency>
+                <Dependency version="4.0.7">kernel-module-headers</Dependency>
             </BuildDependencies>
             <SourceURI>kernel/drivers/module-virtualbox-guest/pspec.xml</SourceURI>
         </Source>
@@ -2470,7 +2499,7 @@
                 <Flag>noDelta</Flag>
             </BuildFlags>
             <RuntimeDependencies>
-                <Dependency version="4.0.6">kernel</Dependency>
+                <Dependency version="4.0.7">kernel</Dependency>
                 <Dependency>baselayout</Dependency>
                 <Dependency version="4.3.28">module-virtualbox-guest-userspace</Dependency>
             </RuntimeDependencies>
@@ -2497,6 +2526,13 @@
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="45">
+                <Date>2015-06-24</Date>
+                <Version>4.3.28</Version>
+                <Comment>Rebuild for kernel-4.0.7.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="44">
                 <Date>2015-06-24</Date>
                 <Version>4.3.28</Version>
@@ -2825,7 +2861,7 @@
             <Archive type="targz" sha1sum="e02beac9cc713011551c483ae5f20f065f5b88c7" target="i686">http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
             <Archive type="targz" sha1sum="bd55f1fdc6b0a4d0a70dc4ba4bb4169a824e238c" target="x86_64">http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz</Archive>
             <BuildDependencies>
-                <Dependency version="4.0.6">kernel-module-headers</Dependency>
+                <Dependency version="4.0.7">kernel-module-headers</Dependency>
             </BuildDependencies>
             <Patches>
                 <Patch level="1">patch/linux-40.patch</Patch>
@@ -2843,8 +2879,8 @@
                 <Flag>noDelta</Flag>
             </BuildFlags>
             <RuntimeDependencies>
-                <Dependency version="4.0.6">kernel</Dependency>
-                <Dependency release="41">module-broadcom-wl-userspace</Dependency>
+                <Dependency version="4.0.7">kernel</Dependency>
+                <Dependency release="42">module-broadcom-wl-userspace</Dependency>
             </RuntimeDependencies>
             <Files>
                 <Path fileType="library" permanent="true">/lib/modules</Path>
@@ -2871,6 +2907,13 @@
             </AdditionalFiles>
         </Package>
         <History>
+            <Update release="42">
+                <Date>2015-06-30</Date>
+                <Version>6.30.223.248</Version>
+                <Comment>Rebuild for kernel 4.0.7.</Comment>
+                <Name>Ertuğrul Erata</Name>
+                <Email>ertugrulerata@gmail.com</Email>
+            </Update>
             <Update release="41">
                 <Date>2015-06-16</Date>
                 <Version>6.30.223.248</Version>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index d2f53796..4d1b2540 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-2cb68bf8b48bf7aaae48ac543fd523fed2912d29
\ No newline at end of file
+86511fac5f5f4e0e14ecc3545a278d7e988ea0ba
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 3105c8ec..a68cbe51 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index d6ce681c..ca4d6ba4 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-0cd1478982df27af9de8978646950a71985633e6
\ No newline at end of file
+4d12dafffeae5cf1eaed1dd28d52d5e9d33b3e7d
\ No newline at end of file