diff --git a/fcst/Kbuild b/fcst/Kbuild
index f7b6dd2a1..6f9a59674 100644
--- a/fcst/Kbuild
+++ b/fcst/Kbuild
@@ -1,5 +1,5 @@
 KBUILD_EXTRA_SYMBOLS=$(src)/../scst/src/Module.symvers
-ccflags-y += -I$(src)/../scst/include $(shell grep -qw fc_fill_fc_hdr $$(pwd)/include/scsi/fc_encode.h 2>/dev/null && echo -DFC_FILL_FC_HDR_IN_SCSI_FC_ENCODE_H)
+ccflags-y += -I$(src)/../scst/include $(shell if [ -e include/scsi ]; then header_dir=.; else header_dir=$$(sed 's/^include[[:blank:]]\+\(.*\)\/Makefile$$/\1/' Makefile); fi; if false; then echo "header_dir=$${header_dir}" >&2; fi; grep -qw fc_fill_fc_hdr "$${header_dir}/include/scsi/fc_encode.h" 2>/dev/null && echo -DFC_FILL_FC_HDR_IN_SCSI_FC_ENCODE_H)
 
 obj-$(CONFIG_FCST) += fcst.o
 
diff --git a/nightly/conf/nightly.conf b/nightly/conf/nightly.conf
index 651872684..d6684d75b 100644
--- a/nightly/conf/nightly.conf
+++ b/nightly/conf/nightly.conf
@@ -69,4 +69,5 @@ ABT_KERNELS="  \
 5.4.17-2102.206.1.el7uek^UEK^7-nc       \
 5.4.17-2036.104.5.el7uek^UEK^7-nc       \
 5.4.17-2011.7.4.el7uek^UEK^7-nc         \
+4.1.12-124.48.6.el6uek^UEK^6-nc		\
 "