diff --git a/Makefile b/Makefile
index 7640e6c0d..061a3d68c 100644
--- a/Makefile
+++ b/Makefile
@@ -67,6 +67,11 @@ VERSION := $(VERSION_WITHOUT_REVISION)$(REVISION)
 DEBIAN_REVISION=1.1
 RPMTOPDIR ?= $(shell if [ $$(id -u) = 0 ]; then echo /usr/src/packages;\
 		else echo $$PWD/rpmbuilddir; fi)
+SCST_SOURCE_FILES = $(shell if [ -e scripts/list-source-files ]; then	\
+				scripts/list-source-files;		\
+			else						\
+				echo scripts-source-files-is-missing;	\
+			fi)
 
 help:
 	@echo "		all               : make all"
@@ -309,7 +314,7 @@ make-scst-dist =							\
 
 scst-dist-gzip: scst-$(VERSION).tar.bz2
 
-scst-$(VERSION).tar.bz2: $(shell scripts/list-source-files)
+scst-$(VERSION).tar.bz2: $(SCST_SOURCE_FILES)
 	$(call make-scst-dist,j,bz2,$(VERSION),grep -E '^doc/|^fcst/|^iscsi-scst/|^Makefile|^qla2x00t(|_git)/|^scripts/|^scst.spec|^scst/|^scst_local/|^srpt/|^usr/|^scstadmin/')
 
 scst-rpm:
@@ -363,12 +368,12 @@ debian/compat:
 	sed 's/\..*//' >$@
 
 ../scst_$(VERSION).orig.tar.gz: debian/changelog debian/compat Makefile	\
-		$(shell scripts/list-source-files)
+		$(SCST_SOURCE_FILES)
 	$(call make-scst-dist,z,gz,$(VERSION),cat) &&			\
 	mv "scst-$(VERSION).tar.gz" "$@"
 
 ../scst_$(VERSION).orig.tar.xz: debian/changelog debian/compat Makefile	\
-		$(shell scripts/list-source-files)
+		$(SCST_SOURCE_FILES)
 	$(call make-scst-dist,J,xz,$(VERSION),cat) &&			\
 	mv "scst-$(VERSION).tar.xz" "$@"
 
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 0c4f75c06..f27c7a7ae 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -3,36 +3,36 @@
 ABT_DETAILS="x86_64"
 ABT_JOBS=5
 ABT_KERNELS="  \
-5.12.4         \
-5.11.20-nc     \
-5.10.37-nc     \
+5.12.12        \
+5.11.22-nc     \
+5.10.45-nc     \
 5.9.16-nc      \
 5.8.18-nc      \
 5.7.19-nc      \
 5.6.19-nc      \
 5.5.19-nc      \
-5.4.119-nc     \
+5.4.127-nc     \
 5.3.18-nc      \
 5.2.21-nc      \
 5.1.21-nc      \
 5.0.21-nc      \
 4.20.17-nc     \
-4.19.190-nc    \
+4.19.195-nc    \
 4.18.20-nc     \
 4.17.19-nc     \
 4.16.18-nc     \
 4.15.18-nc     \
-4.14.232-nc    \
+4.14.237-nc    \
 4.13.16-nc     \
 4.12.14-nc     \
 4.11.12-nc     \
 4.10.17-nc     \
-4.9.268-nc     \
+4.9.273-nc     \
 4.8.17-nc      \
 4.7.10-nc      \
 4.6.7-nc       \
 4.5.7-nc       \
-4.4.268-nc     \
+4.4.273-nc     \
 4.3.6-nc       \
 4.2.8-nc       \
 4.1.52-nc      \
@@ -66,6 +66,7 @@ ABT_KERNELS="  \
 2.6.33.7-nc    \
 2.6.32.27-nc   \
 2.6.31.14-nc   \
+4.18.0-305.3.1.el8^CentOS^8.4.2105-nc    \
 4.18.0-240.15.1.el8_3^CentOS^8.3.2011-nc \
 4.18.0-193.28.1.el8_2^CentOS^8.2.2004-nc \
 4.18.0-147.8.1.el8_1^CentOS^8.1.1911-nc	\