diff --git a/conf.sh b/conf.sh
index 27e133a..15b6813 100644
--- a/conf.sh
+++ b/conf.sh
@@ -5,9 +5,9 @@ AZB_ZOL_VERSION="0.6.3"
 AZB_GIT_SPL_COMMIT="03a78353"
 AZB_GIT_ZFS_COMMIT="d958324f"
 AZB_GIT_PKGREL="1"
-AZB_GIT_KERNEL_VERSION="3.18.2"
-AZB_GIT_KERNEL_X32_PKGREL="2"
-AZB_GIT_KERNEL_X64_PKGREL="2"
+AZB_GIT_KERNEL_VERSION="3.18.4"
+AZB_GIT_KERNEL_X32_PKGREL="1"
+AZB_GIT_KERNEL_X64_PKGREL="1"
 AZB_GIT_KERNEL_X32_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X32_PKGREL}"
 AZB_GIT_KERNEL_X64_VERSION="${AZB_GIT_KERNEL_VERSION}-${AZB_GIT_KERNEL_X64_PKGREL}"
 
diff --git a/spl-git/PKGBUILD b/spl-git/PKGBUILD
index 64fc465..dc8e868 100644
--- a/spl-git/PKGBUILD
+++ b/spl-git/PKGBUILD
@@ -8,17 +8,17 @@
 # The build script generates and updates the pkgver and _kernel* variables.
 #
 pkgname="spl-git"
-pkgver=0.6.3_r54_g03a7835_3.18.2_2
+pkgver=0.6.3_r54_g03a7835_3.18.4_1
 pkgrel=1
 license=('GPL')
 
 # Used incase the i686 and x86_64 linux packages get out of sync with the
 # PKGREL. This occurred on January 31, 2014 where i686 was versioned at
 # 3.12.9-1 and x86_64 was versioned at 3.12.9-2.
-_kernel_version_x32="3.18.2-2"
-_kernel_version_x32_full="3.18.2-2"
-_kernel_version_x64="3.18.2-2"
-_kernel_version_x64_full="3.18.2-2"
+_kernel_version_x32="3.18.4-1"
+_kernel_version_x32_full="3.18.4-1"
+_kernel_version_x64="3.18.4-1"
+_kernel_version_x64_full="3.18.4-1"
 
 if [[ $CARCH == "i686" ]]; then
     _kernel_version=${_kernel_version_x32}
diff --git a/spl-git/spl.install b/spl-git/spl.install
index 70f6fcb..099ab60 100644
--- a/spl-git/spl.install
+++ b/spl-git/spl.install
@@ -28,8 +28,8 @@ check_hostid() {
 run_depmod() {
     echo ">>> Updating module dependencies. Please wait ..."
 
-    _kernel_version_x32_full="3.18.2-2"
-    _kernel_version_x64_full="3.18.2-2"
+    _kernel_version_x32_full="3.18.4-1"
+    _kernel_version_x64_full="3.18.4-1"
 
     [[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full}
 
diff --git a/spl-utils-git/PKGBUILD b/spl-utils-git/PKGBUILD
index ed0d363..c2ba9ef 100644
--- a/spl-utils-git/PKGBUILD
+++ b/spl-utils-git/PKGBUILD
@@ -8,7 +8,7 @@
 # The build script generates and updates the pkgver and _kernel* variables.
 #
 pkgname="spl-utils-git"
-pkgver=0.6.3_r54_g03a7835_3.18.2_2
+pkgver=0.6.3_r54_g03a7835_3.18.4_1
 pkgrel=1
 license=('GPL')
 pkgdesc="Solaris Porting Layer kernel module support files."
diff --git a/zfs-git/PKGBUILD b/zfs-git/PKGBUILD
index dd3c46c..bca1145 100644
--- a/zfs-git/PKGBUILD
+++ b/zfs-git/PKGBUILD
@@ -8,17 +8,17 @@
 # The build script generates and updates the pkgver and _kernel* variables.
 #
 pkgname="zfs-git"
-pkgver=0.6.3_r170_gd958324f_3.18.2_2
+pkgver=0.6.3_r170_gd958324f_3.18.4_1
 pkgrel=1
 license=('CDDL')
 
 # Used incase the i686 and x86_64 linux packages get out of sync with the
 # PKGREL. This occurred on January 31, 2014 where i686 was versioned at
 # 3.12.9-1 and x86_64 was versioned at 3.12.9-2.
-_kernel_version_x32="3.18.2-2"
-_kernel_version_x32_full="3.18.2-2"
-_kernel_version_x64="3.18.2-2"
-_kernel_version_x64_full="3.18.2-2"
+_kernel_version_x32="3.18.4-1"
+_kernel_version_x32_full="3.18.4-1"
+_kernel_version_x64="3.18.4-1"
+_kernel_version_x64_full="3.18.4-1"
 
 if [[ $CARCH == "i686" ]]; then
     _kernel_version=${_kernel_version_x32}
diff --git a/zfs-git/zfs.install b/zfs-git/zfs.install
index 1df202a..ad35d1b 100644
--- a/zfs-git/zfs.install
+++ b/zfs-git/zfs.install
@@ -13,8 +13,8 @@ post_upgrade() {
 check_initramfs() {
     echo ">>> Updating module dependencies. Please wait ..."
 
-    _kernel_version_x32_full="3.18.2-2"
-    _kernel_version_x64_full="3.18.2-2"
+    _kernel_version_x32_full="3.18.4-1"
+    _kernel_version_x64_full="3.18.4-1"
 
     [[ $CARCH == "i686" ]] && _kernel_version_full=${_kernel_version_x32_full} || _kernel_version_full=${_kernel_version_x64_full}
 
diff --git a/zfs-utils-git/PKGBUILD b/zfs-utils-git/PKGBUILD
index d5b6844..b8d4b40 100644
--- a/zfs-utils-git/PKGBUILD
+++ b/zfs-utils-git/PKGBUILD
@@ -8,7 +8,7 @@
 # The build script generates and updates the pkgver and _kernel* variables.
 #
 pkgname="zfs-utils-git"
-pkgver=0.6.3_r170_gd958324f_3.18.2_2
+pkgver=0.6.3_r170_gd958324f_3.18.4_1
 pkgrel=1
 license=('CDDL')
 pkgdesc="Kernel module support files for the Zettabyte File System."
@@ -23,8 +23,8 @@ source=("git+https://github.com/zfsonlinux/zfs.git#commit=d958324f"
 groups=("archzfs-git")
 md5sums=('SKIP'
          '9ddb0c8a94861f929d0fa741fdc49950'
-         'a584c3af9e0aee7a545edefb57c0b48f'
-         '87edeffee32ee1154a373f1291e81b49')
+         '9ef4841abb85dee611828cc7e6f5c6fe'
+         '62ba32c6853c315ff231c396cf8bfdbb')
 replaces=("zfs-utils")
 provides=("zfs-utils")
 conflicts=("zfs-utils" "zfs-utils-lts")