diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fa6a678
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,13 @@
+*.o
+*.o.*
+*.mod
+*.mod.*
+*.ko
+*.cmd
+*.mk
+*.symvers
+*.order
+src/rapiddisk
+test/rxflush
+test/rxio
+test/rxioctl
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09e1fbe..e56bb24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-### Release 6.1 ###
+### Release 6.0-1 ###
 
 - kernel: Fix dkms version in module/Makefile.
 - installer: modified dkms installation/removal procedures
diff --git a/module/Makefile b/module/Makefile
index 76234d6..7d1f6b2 100644
--- a/module/Makefile
+++ b/module/Makefile
@@ -27,7 +27,7 @@ endif
 
 MKDIR := mkdir -pv
 CP := cp -v
-DKMSFILES := $(shell ls *.c) dkms.conf Makefile
+DKMSFILES := rapiddisk.c rapiddisk-cache.c dkms.conf Makefile
 DKMSDEST := /usr/src/rapiddisk-$(VERSION)
 
 obj-m += rapiddisk.o
@@ -52,6 +52,9 @@ clean:
 	rm -rf .tmp_versions .rapiddisk.o.d *.unsigned *.sdtinfo.c .ctf/ .cache.mk
 
 dkms-install:
+ifeq (, $(shell which dkms))
+	$(error "No dkms.")
+else
 ifeq ($(shell dkms status rapiddisk/$(VERSION) -k $(KVER) | grep '$(KVER)' >/dev/null && echo 0 || echo 1 ),0)
 	$(error rapiddisk version $(VERSION) is already installed for kernel $(KVER). Use 'make dkms-uninstall' first.)
 else
@@ -59,11 +62,15 @@ else
 	$(CP) $(DKMSFILES) $(DKMSDEST)
 	dkms install rapiddisk/$(VERSION) -k $(KVER) .
 endif
+endif
 
 dkms-uninstall:
+ifeq (, $(shell which dkms))
+	$(error "No dkms.")
+else
 ifeq ($(shell dkms status rapiddisk/$(VERSION) -k $(KVER) | grep '$(KVER)' >/dev/null && echo 0 || echo 1 ),0)
 	dkms remove rapiddisk/$(VERSION) -k $(KVER)
 else
 	$(error rapiddisk version $(VERSION) is not installed for kernel $(KVER).)
 endif
-
+endif