diff --git a/build.sh b/build.sh
index e0072f5..9e164d4 100755
--- a/build.sh
+++ b/build.sh
@@ -367,6 +367,7 @@ for (( i = 0; i < ${#modes[@]}; i++ )); do
             msg "${update_funcs[@]}"
         for func in "${update_funcs[@]}"; do
             debug "Evaluating '${func}'"
+            reset_variables
             "${func}"
             msg "${pkg_list[@]}"
             for pkg in "${pkg_list[@]}"; do
@@ -384,7 +385,7 @@ for (( i = 0; i < ${#modes[@]}; i++ )); do
             debug "Skipping '${func}' (non stable)"
             continue
         fi
-
+        reset_variables
         "${func}"
         if have_command "update"; then
             msg "Updating PKGBUILDs for kernel '${kernel_name}'"
diff --git a/lib.sh b/lib.sh
index cac37d6..edaee4b 100644
--- a/lib.sh
+++ b/lib.sh
@@ -395,9 +395,7 @@ kernel_version_full_no_hyphen() {
     echo $(kernel_version_full ${1} | sed s/-/./g)
 }
 
-# from makepkg
-source_safe() {
-    # reset variables
+reset_variables() {
     kernel_version_full_pkgver=""
     kernel_version_full=""
     kernel_version=""
@@ -427,7 +425,15 @@ source_safe() {
     spl_replaces=""
     zfs_replaces=""
     zfs_set_commit=""
+    spl_replaces=''
+    zfs_replaces=''
+    spl_utils_replaces=''
+    zfs_utils_replaces=''
+}
 
+# from makepkg
+source_safe() {
+    reset_variables
     export script_dir mode kernel_name
     shopt -u extglob
     if ! source "$@"; then
diff --git a/src/kernels/_utils.sh b/src/kernels/_utils.sh
index 3af1174..560492d 100644
--- a/src/kernels/_utils.sh
+++ b/src/kernels/_utils.sh
@@ -13,7 +13,7 @@ zfs_git_url="https://github.com/zfsonlinux/zfs.git"
 spl_git_url="https://github.com/zfsonlinux/spl.git"
 
 # Version for RC packages
-pkgrel_rc="1"
+pkgrel_rc="2"
 
 header="\
 # Maintainer: Jan Houben <jan@nexttrex.de>
diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh
index 1ef589c..c1ae3cf 100644
--- a/src/kernels/linux.sh
+++ b/src/kernels/linux.sh
@@ -14,7 +14,7 @@ zfs_git_url="https://github.com/zfsonlinux/zfs.git"
 spl_git_url="https://github.com/zfsonlinux/spl.git"
 
 # Version for RC packages
-pkgrel_rc="1"
+pkgrel_rc="2"
 
 header="\
 # Maintainer: Jan Houben <jan@nexttrex.de>