diff --git a/.gitmodules b/.gitmodules
index d8ce536..7a89d4e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,26 +1,3 @@
-[submodule "zfs-linux-git"]
-	path = packages/linux/zfs-linux-git
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux-git.git
-	branch = master
-[submodule "zfs-linux-lts"]
-	path = packages/linux-lts/zfs-linux-lts
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git
-	branch = master
-[submodule "spl-linux-git"]
-	path = packages/linux/spl-linux-git
-	url = ssh+git://aur@aur.archlinux.org/spl-linux-git.git
-	branch = master
-	branch = master
-[submodule "spl-linux-lts"]
-	path = packages/linux-lts/spl-linux-lts
-	url = ssh+git://aur@aur.archlinux.org/spl-linux-lts.git
-	branch = master
-[submodule "zfs-linux"]
-	path = packages/linux/zfs-linux
-	url = ssh+git://aur@aur.archlinux.org/zfs-linux.git
-[submodule "spl-linux"]
-	path = packages/linux/spl-linux
-	url = ssh+git://aur@aur.archlinux.org/spl-linux.git
 [submodule "packages/archiso/zfs-archiso-linux"]
 	path = packages/archiso/zfs-archiso-linux
 	url = ssh+git://aur@aur.archlinux.org/zfs-archiso-linux.git
@@ -33,3 +10,27 @@
 [submodule "packages/linux-hardened/zfs-linux-hardened"]
 	path = packages/linux-hardened/zfs-linux-hardened
 	url = ssh+git://aur@aur.archlinux.org/zfs-linux-hardened.git
+[submodule "packages/linux/zfs-linux-git"]
+	path = packages/linux/zfs-linux-git
+	url = ssh+git://aur@aur.archlinux.org/zfs-linux-git.git
+[submodule "packages/linux/spl-linux-git"]
+	path = packages/linux/spl-linux-git
+	url = ssh+git://aur@aur.archlinux.org/spl-linux-git.git
+[submodule "packages/linux/zfs-linux"]
+	path = packages/linux/zfs-linux
+	url = ssh+git://aur@aur.archlinux.org/zfs-linux.git
+[submodule "packages/linux/spl-linux"]
+	path = packages/linux/spl-linux
+	url = ssh+git://aur@aur.archlinux.org/spl-linux.git
+[submodule "packages/linux-lts/zfs-linux-lts"]
+	path = packages/linux-lts/zfs-linux-lts
+	url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts.git
+[submodule "packages/linux-lts/spl-linux-lts"]
+	path = packages/linux-lts/spl-linux-lts
+	url = ssh+git://aur@aur.archlinux.org/spl-linux-lts.git
+[submodule "packages/linux-lts/spl-linux-lts-git"]
+	path = packages/linux-lts/spl-linux-lts-git
+	url = ssh+git://aur@aur.archlinux.org/spl-linux-lts-git.git
+[submodule "packages/linux-lts/zfs-linux-lts-git"]
+	path = packages/linux-lts/zfs-linux-lts-git
+	url = ssh+git://aur@aur.archlinux.org/zfs-linux-lts-git.git
diff --git a/conf.sh b/conf.sh
index 549978c..6b46630 100644
--- a/conf.sh
+++ b/conf.sh
@@ -6,7 +6,7 @@ zfs_src_hash="136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d"
 spl_src_hash="ebab87a064985f93122ad82721ca54569a5ef20dc3579f84d18075210cf316ac"
 zfs_bash_completion_hash="b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540"
 zfs_initcpio_install_hash="aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca"
-zfs_initcpio_hook_hash="90d50df503464e8d76770488dbd491cb633ee27984d4d3a31b03f1a4e7492038"
+zfs_initcpio_hook_hash="2bb533db561992c861bb9acad64a127f81cf0e4bf39cb4308ac7a73a17db55a7"
 
 # Notification address
 email="jeezusjr@gmail.com"
diff --git a/lib.sh b/lib.sh
index 841ad41..fc0e641 100644
--- a/lib.sh
+++ b/lib.sh
@@ -357,7 +357,7 @@ package_version_from_syncdb() {
 kernel_version_has_minor_version() {
     # $1: the kernel version
     # returns: 0 if the version contains a minor version and 1 if it does not
-    if [[ ${1} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:alnum:]]+) ]]; then
+    if [[ ${1} =~ ^[[:digit:]]+\.[[:digit:]]+\.([[:digit:]]+) ]]; then
         debug "kernel_version_has_minor_version: Have kernel with minor version!"
         return 0
     fi
diff --git a/packages/common/spl-utils-common b/packages/common/spl-utils-common
new file mode 160000
index 0000000..693ec25
--- /dev/null
+++ b/packages/common/spl-utils-common
@@ -0,0 +1 @@
+Subproject commit 693ec252069a7dbecfd2efae6723be4ae80501de
diff --git a/packages/common/spl-utils-common-git b/packages/common/spl-utils-common-git
new file mode 160000
index 0000000..4b47296
--- /dev/null
+++ b/packages/common/spl-utils-common-git
@@ -0,0 +1 @@
+Subproject commit 4b47296c79cb243a5cb397d368a01285d3c8cfb2
diff --git a/packages/common/zfs-utils-common b/packages/common/zfs-utils-common
new file mode 160000
index 0000000..b42834e
--- /dev/null
+++ b/packages/common/zfs-utils-common
@@ -0,0 +1 @@
+Subproject commit b42834e09b463b4e5e52583c40a16b78a378b16f
diff --git a/packages/common/zfs-utils-common-git b/packages/common/zfs-utils-common-git
new file mode 160000
index 0000000..02105c5
--- /dev/null
+++ b/packages/common/zfs-utils-common-git
@@ -0,0 +1 @@
+Subproject commit 02105c5d156f5b09ce0df770b80f77ac1149f54b
diff --git a/packages/linux-hardened/spl-linux-hardened-git b/packages/linux-hardened/spl-linux-hardened-git
new file mode 160000
index 0000000..685852d
--- /dev/null
+++ b/packages/linux-hardened/spl-linux-hardened-git
@@ -0,0 +1 @@
+Subproject commit 685852db1bc3c3b09b2cbdb9076e8d7631f706af
diff --git a/packages/linux-hardened/zfs-linux-hardened-git b/packages/linux-hardened/zfs-linux-hardened-git
new file mode 160000
index 0000000..71b3f0c
--- /dev/null
+++ b/packages/linux-hardened/zfs-linux-hardened-git
@@ -0,0 +1 @@
+Subproject commit 71b3f0c031406fc6320afd502557668a9af38816
diff --git a/src/kernels/archiso.sh b/src/kernels/archiso.sh
index eedc771..4e9aec3 100644
--- a/src/kernels/archiso.sh
+++ b/src/kernels/archiso.sh
@@ -36,9 +36,9 @@ update_archiso_linux_pkgbuilds() {
     zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
-    spl_utils_pkgname="spl-utils-linux-common"
+    spl_utils_pkgname="spl-utils-common"
     spl_pkgname="spl-archiso-linux"
-    zfs_utils_pkgname="zfs-utils-linux-common"
+    zfs_utils_pkgname="zfs-utils-common"
     zfs_pkgname="zfs-archiso-linux"
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh
index 27a6994..85cbe42 100644
--- a/src/kernels/linux-hardened.sh
+++ b/src/kernels/linux-hardened.sh
@@ -15,7 +15,6 @@ zfs_git_url="https://github.com/zfsonlinux/zfs.git"
 spl_git_url="https://github.com/zfsonlinux/spl.git"
 
 header="\
-# Maintainer: Jan Houben <jan@nexttrex.de>
 # Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
 #
 # This PKGBUILD was generated by the archzfs build scripts located at
@@ -39,14 +38,14 @@ update_linux_hardened_pkgbuilds() {
     kernel_version_full=$(kernel_version_full ${kernel_version})
     kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version})
     kernel_version_major=${kernel_version%-*}
-    kernel_mod_path="${kernel_version/[a-z]/0}-hardened"
+    kernel_mod_path="${kernel_version_full/\.[a-z]/}-hardened"
     archzfs_package_group="archzfs-linux-hardened"
     spl_pkgver=${zol_version}_${kernel_version_full_pkgver}
     zfs_pkgver=${zol_version}_${kernel_version_full_pkgver}
     spl_pkgrel=${pkgrel}
     zfs_pkgrel=${pkgrel}
     spl_conflicts="'spl-linux-hardened-git'"
-    spl_headers_conflicts="'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
+    spl_headers_conflicts="'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers'"
     zfs_headers_conflicts="'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
     zfs_conflicts="'zfs-linux-hardened-git'"
     spl_utils_pkgname="spl-utils-common"
@@ -70,14 +69,14 @@ update_linux_hardened_pkgbuilds() {
 #     kernel_version_full=$(kernel_version_full ${kernel_version_git})
 #     kernel_version_full_pkgver=$(kernel_version_full_no_hyphen ${kernel_version_git})
 #     kernel_version_major=${kernel_version_git%-*}
-#     kernel_mod_path="${kernel_version/[a-z]/0}-hardened"
+#     kernel_mod_path="${kernel_version_full/\.[a-z]/}-hardened"
 #     archzfs_package_group="archzfs-linux-hardened-git"
 #     spl_pkgver="" # Set later by call to git_calc_pkgver
 #     zfs_pkgver="" # Set later by call to git_calc_pkgver
 #     spl_pkgrel=${pkgrel_git}
 #     zfs_pkgrel=${pkgrel_git}
 #     spl_conflicts="'spl-linux-hardened'"
-#     spl_headers_conflicts="'spl-linux-hardened-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-hardened-headers' 'spl-linux-hardened-git-headers'"
+#     spl_headers_conflicts="'spl-linux-hardened-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers'"
 #     zfs_headers_conflicts="'zfs-linux-hardened-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers'"
 #     zfs_conflicts="'zfs-linux-hardened'"
 #     spl_utils_pkgname="spl-utils-common-git"
diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh
index 00e17de..fe6d394 100755
--- a/src/spl/PKGBUILD.sh
+++ b/src/spl/PKGBUILD.sh
@@ -12,6 +12,7 @@ url="http://zfsonlinux.org/"
 source=("${spl_src_target}")
 sha256sums=("${spl_src_hash}")
 license=("GPL")
+depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
 
 build() {
     cd "${spl_workdir}"
@@ -25,7 +26,6 @@ build() {
 
 package_${spl_pkgname}() {
     pkgdesc="Solaris Porting Layer kernel modules."
-    depends=("${spl_utils_pkgname}" "kmod" ${linux_depends})
     install=spl.install
     provides=("spl")
     groups=("${archzfs_package_group}")
diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh
index 20450c4..e1dd15d 100755
--- a/src/zfs/PKGBUILD.sh
+++ b/src/zfs/PKGBUILD.sh
@@ -12,6 +12,7 @@ url="http://zfsonlinux.org/"
 source=("${zfs_src_target}")
 sha256sums=("${zfs_src_hash}")
 license=("CDDL")
+depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
 
 build() {
     cd "${zfs_workdir}"
@@ -26,7 +27,6 @@ build() {
 
 package_${zfs_pkgname}() {
     pkgdesc="Kernel modules for the Zettabyte File System."
-    depends=("kmod" "${spl_pkgname}" "${zfs_utils_pkgname}" ${linux_depends})
     install=zfs.install
     provides=("zfs")
     groups=("${archzfs_package_group}")