diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh
index ff00d60..60b4e8c 100755
--- a/scripts/inner_chroot_script.sh
+++ b/scripts/inner_chroot_script.sh
@@ -114,8 +114,9 @@ for conf in package.mask package.unmask package.keywords make.conf package.use;
 		fi
 	fi
 done
-# split config file
-for conf in 00-sabayon.package.use; do
+# split config files
+for conf in 00-sabayon.package.use 00-sabayon.package.mask \
+	00-sabayon.package.unmask 00-sabayon.package.keywords; do
 	repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard
 	repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null)
 	if [ -n "${repo_conf}" ]; then
diff --git a/scripts/inner_source_chroot_update.sh b/scripts/inner_source_chroot_update.sh
index cb99a13..eb1eb13 100755
--- a/scripts/inner_source_chroot_update.sh
+++ b/scripts/inner_source_chroot_update.sh
@@ -99,7 +99,8 @@ for conf in package.mask package.unmask package.keywords make.conf package.use;
 done
 
 # split config file
-for conf in 00-sabayon.package.use; do
+for conf in 00-sabayon.package.use 00-sabayon.package.mask \
+	00-sabayon.package.unmask 00-sabayon.package.keywords; do
 	repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard
 	repo_conf=$(ls -1 ${repo_path}/*/*/${conf} | sort | tail -n 1 2>/dev/null)
 	if [ -n "${repo_conf}" ]; then