diff --git a/packages/linux-lts/spl-linux-lts b/packages/linux-lts/spl-linux-lts
index 5a523f4..05d55aa 160000
--- a/packages/linux-lts/spl-linux-lts
+++ b/packages/linux-lts/spl-linux-lts
@@ -1 +1 @@
-Subproject commit 5a523f451d54f83a36f72c127b8524ae1a8910dc
+Subproject commit 05d55aaf79f3cebae659db3fc933f3446ad6aeb6
diff --git a/packages/linux-lts/spl-utils-linux-lts b/packages/linux-lts/spl-utils-linux-lts
index 2e55108..7356d00 160000
--- a/packages/linux-lts/spl-utils-linux-lts
+++ b/packages/linux-lts/spl-utils-linux-lts
@@ -1 +1 @@
-Subproject commit 2e5510814a9b5a0b8345010d6ba7f3f6bba1291a
+Subproject commit 7356d0002d37def2185d77b70f337535806fe9c0
diff --git a/packages/linux-lts/zfs-linux-lts b/packages/linux-lts/zfs-linux-lts
index 9745ed5..995caae 160000
--- a/packages/linux-lts/zfs-linux-lts
+++ b/packages/linux-lts/zfs-linux-lts
@@ -1 +1 @@
-Subproject commit 9745ed51dc38def2e82c94e7a451219f181d776b
+Subproject commit 995caaea8a587ffb54150581a35c194a6b90de1b
diff --git a/packages/linux-lts/zfs-utils-linux-lts b/packages/linux-lts/zfs-utils-linux-lts
index 1217e15..8445565 160000
--- a/packages/linux-lts/zfs-utils-linux-lts
+++ b/packages/linux-lts/zfs-utils-linux-lts
@@ -1 +1 @@
-Subproject commit 1217e15bca0b8cf3b603a31c01ee01d688c3f4bb
+Subproject commit 8445565f37d79649fcf367fcce67fb402db4f077
diff --git a/packages/linux/spl-linux b/packages/linux/spl-linux
index e7b2306..fadc3bd 160000
--- a/packages/linux/spl-linux
+++ b/packages/linux/spl-linux
@@ -1 +1 @@
-Subproject commit e7b2306b18d2f6cd4e5d2e697f1798268bade6c9
+Subproject commit fadc3bda237dd6176d395482c9a7166c82ede9e5
diff --git a/packages/linux/spl-utils-linux b/packages/linux/spl-utils-linux
index 9a90027..6061727 160000
--- a/packages/linux/spl-utils-linux
+++ b/packages/linux/spl-utils-linux
@@ -1 +1 @@
-Subproject commit 9a900277d1d3a51f4d3cf5598035243ae064ab01
+Subproject commit 6061727698ffbd13f63a22cb7c868d557174b01c
diff --git a/packages/linux/zfs-linux b/packages/linux/zfs-linux
index a3f5a13..e0d5aad 160000
--- a/packages/linux/zfs-linux
+++ b/packages/linux/zfs-linux
@@ -1 +1 @@
-Subproject commit a3f5a13ff48173169001f3f2fb74f7256fc7dc35
+Subproject commit e0d5aaddfd39bd0202156f863427099bdbe8f887
diff --git a/packages/linux/zfs-utils-linux b/packages/linux/zfs-utils-linux
index 53ee92c..ab2ef9a 160000
--- a/packages/linux/zfs-utils-linux
+++ b/packages/linux/zfs-utils-linux
@@ -1 +1 @@
-Subproject commit 53ee92c39c289d2fa3948035d0ca56eb626e8b83
+Subproject commit ab2ef9a42bc82f37d0cf38b34497f5b3fc33a1f2
diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh
index 76bdbe7..dafef0a 100644
--- a/src/kernels/linux-lts.sh
+++ b/src/kernels/linux-lts.sh
@@ -4,12 +4,10 @@ mode_desc="Select and use the packages for the linux-lts kernel"
 
 # Kernel versions for LTS packages
 pkgrel="1"
-kernel_version="4.4.7-1"
-kernel_version_major_next="4.5"
+kernel_version="4.4.8-1"
+kernel_version_next="4.5"
 
-header=""
-header() {
-    header="\
+header="\
 # Maintainer: Jesus Alvarez <jeezusjr at gmail dot com>
 #
 # This PKGBUILD was generated by the archzfs build scripts located at
@@ -19,38 +17,37 @@ header() {
 # ! WARNING !
 #
 # The archzfs packages are kernel modules, so these PKGBUILDS will only work with the kernel package they target. In this
-# case, the ${archzfs_package_group} packages will only work with the ${linux_target} package! To have a single PKGBUILD
-# target many kernels would make for a cluttered PKGBUILD!
+# case, the archzfs-linux-lts packages will only work with the default linux-lts package! To have a single PKGBUILD target
+# many kernels would make for a cluttered PKGBUILD!
 #
 # If you have a custom kernel, you will need to change things in the PKGBUILDS. If you would like to have AUR or archzfs repo
 # packages for your favorite kernel package built using the archzfs build tools, submit a request in the Issue tracker on the
 # archzfs github page.
 #
 #"
-}
 
-update_lts_pkgbuilds() {
-    pkg_list="spl-utils-lts spl-lts zfs-utils-lts zfs-lts"
-    kernel_version_full=$(kernel_version_full ${lts_kernel_version})
-    kernel_mod_path="${kernel_version_full}-ARCH"
-    archzfs_package_group="archzfs-lts"
-    spl_pkgver=${zol_version}_$(kernel_version_full_no_hyphen ${lts_kernel_version})
-    zfs_pkgver=${spl_pkgver}
-    spl_pkgrel=${lts_pkgrel}
-    zfs_pkgrel=${lts_pkgrel}
-    spl_utils_pkgname="spl-utils-lts"
-    spl_pkgname="spl-lts"
-    zfs_utils_pkgname="zfs-utils-lts"
-    zfs_pkgname="zfs-lts"
-    spl_utils_pkgbuild_path="packages/${mode}/spl-utils-lts"
-    spl_pkgbuild_path="packages/${mode}/spl-lts"
-    zfs_utils_pkgbuild_path="packages/${mode}/zfs-utils-lts"
-    zfs_pkgbuild_path="packages/${mode}/zfs-lts"
+update_linux_lts_pkgbuilds() {
+    pkg_list="spl-utils-linux-lts spl-linux-lts zfs-utils-linux-lts zfs-linux-lts"
+    kernel_version_full=$(kernel_version_full ${kernel_version})
+    kernel_version_major=${kernel_version%-*}
+    kernel_mod_path="${kernel_version_full}-lts"
+    archzfs_package_group="archzfs-linux-lts"
+    spl_pkgver=${zol_version}_$(kernel_version_full_no_hyphen ${kernel_version})
+    zfs_pkgver=${zol_version}_$(kernel_version_full_no_hyphen ${kernel_version})
+    spl_pkgrel=${pkgrel}
+    zfs_pkgrel=${pkgrel}
+    spl_utils_pkgname="spl-utils-linux-lts"
+    spl_pkgname="spl-linux-lts"
+    zfs_utils_pkgname="zfs-utils-linux-lts"
+    zfs_pkgname="zfs-linux-lts"
+    spl_utils_pkgbuild_path="packages/${MODE_NAME}/${spl_utils_pkgname}"
+    spl_pkgbuild_path="packages/${MODE_NAME}/${spl_pkgname}"
+    zfs_utils_pkgbuild_path="packages/${MODE_NAME}/${zfs_utils_pkgname}"
+    zfs_pkgbuild_path="packages/${MODE_NAME}/${zfs_pkgname}"
     spl_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${zol_version}.tar.gz"
     zfs_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${zol_version}.tar.gz"
-    spl_workdir="\${SRCDIR}/spl-${zol_version}"
-    zfs_workdir="\${SRCDIR}/zfs-${zol_version}"
-    linux_depends="linux>=${kernel_version_major} linux<${std_kernel_version_major_next}"
-    linux_headers_depends="linux-headers>=${kernel_major_version}" "linux-headers<${kernel_major_version_next}"
-    header
+    spl_workdir="\${srcdir}/spl-${zol_version}"
+    zfs_workdir="\${srcdir}/zfs-${zol_version}"
+    linux_depends="\"linux-lts>=${kernel_version_major}\" \"linux-lts<${kernel_version_next}\""
+    linux_headers_depends="\"linux-lts-headers>=${kernel_version_major}\" \"linux-lts-headers<${kernel_version_next}\""
 }
diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh
index 7e18e6e..459e4bb 100644
--- a/src/kernels/linux.sh
+++ b/src/kernels/linux.sh
@@ -54,10 +54,10 @@ update_linux_pkgbuilds() {
     zfs_utils_pkgname="zfs-utils-linux"
     zfs_pkgname="zfs-linux"
     # Paths are relative to build.sh
-    spl_utils_pkgbuild_path="packages/linux/spl-utils-linux"
-    spl_pkgbuild_path="packages/linux/spl-linux"
-    zfs_utils_pkgbuild_path="packages/linux/zfs-utils-linux"
-    zfs_pkgbuild_path="packages/linux/zfs-linux"
+    spl_utils_pkgbuild_path="packages/${MODE_NAME}/${spl_utils_pkgname}"
+    spl_pkgbuild_path="packages/${MODE_NAME}/${spl_pkgname}"
+    zfs_utils_pkgbuild_path="packages/${MODE_NAME}/${zfs_utils_pkgname}"
+    zfs_pkgbuild_path="packages/${MODE_NAME}/${zfs_pkgname}"
     spl_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-${zol_version}.tar.gz"
     zfs_src_target="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-${zol_version}.tar.gz"
     spl_workdir="\${srcdir}/spl-${zol_version}"
@@ -67,7 +67,6 @@ update_linux_pkgbuilds() {
 }
 
 update_linux_git_pkgbuilds() {
-    # CAUTION: Watch out for variable shadowing!
     pkg_list="spl-utils-linux-git spl-linux-git zfs-utils-linux-git zfs-linux-git"
     kernel_version=${kernel_version_git}
     kernel_version_full=$(kernel_version_full ${kernel_version_git})
@@ -83,10 +82,10 @@ update_linux_git_pkgbuilds() {
     spl_pkgname="spl-linux-git"
     zfs_utils_pkgname="zfs-utils-linux-git"
     zfs_pkgname="zfs-linux-git"
-    spl_utils_pkgbuild_path="packages/linux/spl-utils-linux-git"
-    spl_pkgbuild_path="packages/linux/spl-linux-git"
-    zfs_utils_pkgbuild_path="packages/linux/zfs-utils-linux-git"
-    zfs_pkgbuild_path="packages/linux/zfs-linux-git"
+    spl_utils_pkgbuild_path="packages/${MODE_NAME}/${spl_utils_pkgname}"
+    spl_pkgbuild_path="packages/${MODE_NAME}/${spl_pkgname}"
+    zfs_utils_pkgbuild_path="packages/${MODE_NAME}/${zfs_utils_pkgname}"
+    zfs_pkgbuild_path="packages/${MODE_NAME}/${zfs_pkgname}"
     spl_src_target="git+${spl_git_url}"
     if [[ ${spl_git_commit} != "" ]]; then
         spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
diff --git a/src/zfs-utils/zfs-utils.initcpio.hook b/src/zfs-utils/zfs-utils.initcpio.hook
index 566b849..57df9c1 100644
--- a/src/zfs-utils/zfs-utils.initcpio.hook
+++ b/src/zfs-utils/zfs-utils.initcpio.hook
@@ -68,6 +68,9 @@ run_hook() {
     fi
 
     case $zfs in
+        "")
+            # skip this line/dataset
+            ;;
         auto|bootfs)
             ZFS_DATASET='bootfs'
             mount_handler="zfs_mount_handler"
@@ -89,4 +92,8 @@ run_hook() {
     done
 }
 
+run_latehook () {
+    /usr/bin/zpool import -N -a $ZPOOL_FORCE
+}
+
 # vim:set ts=4 sw=4 ft=sh et: