diff --git a/Makefile b/Makefile
index 4d44a96b0..7dee4f530 100644
--- a/Makefile
+++ b/Makefile
@@ -35,6 +35,11 @@ ifdef KDIR
 		cat $(KDIR)/include/config/kernel.release 2>/dev/null || \
 		make -s -C $(KDIR) kernelversion))
      endif
+else
+     ifndef KVER
+	KVER=$(strip $(shell uname -r))
+     endif
+     KDIR=/lib/modules/$(KVER)/build
 endif
 
 ifeq ($(QLA_32GBIT),no)
@@ -380,12 +385,14 @@ debian/compat:
 dpkg: ../scst_$(VERSION).orig.tar.gz
 	@[ -z "$$DEBEMAIL" ] || export DEBEMAIL=bvanassche@acm.org &&	\
 	[ -z "$$DEBFULLNAME" ] || export DEBFULLNAME="Bart Van Assche" &&\
+	echo "KDIR=$(KDIR)" &&						\
+	echo "KVER=$(KVER)" &&						\
 	sed 's/%{scst_version}/$(VERSION)/'				\
 	  <debian/scst.dkms.in >debian/scst.dkms &&			\
-	sed 's/%{KVER}/$(KVER)/'				\
-	  <debian/scst.preinst.in >debian/scst.preinst &&			\
-	sed 's/%{KVER}/$(KVER)/'				\
-	  <debian/scst.postinst.in >debian/scst.postinst &&			\
+	sed 's/%{KVER}/$(KVER)/'					\
+	  <debian/scst.preinst.in >debian/scst.preinst &&		\
+	sed 's/%{KVER}/$(KVER)/'					\
+	  <debian/scst.postinst.in >debian/scst.postinst &&		\
 	output_files=(							\
 		../*_$(VERSION)-$(DEBIAN_REVISION)_*.deb		\
 		../*_$(VERSION)-$(DEBIAN_REVISION)_*.ddeb		\
diff --git a/scstadmin/init.d/scst b/scstadmin/init.d/scst
index 3c6acdaa1..9490e1b29 100755
--- a/scstadmin/init.d/scst
+++ b/scstadmin/init.d/scst
@@ -69,8 +69,6 @@ fi
 PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin
 SCST_DFLT=/etc/default/scst
 
-[ -x "$(which scstadmin)" ] || exit 5
-
 if [ -f $SCST_DFLT ]; then
     . $SCST_DFLT
 fi