diff --git a/.gitignore b/.gitignore
index bfce0902fe..3a8cb2e867 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@
 # Normal rules
 #
 *.[oa]
+*.o.ur-safe
 *.lo
 *.la
 *.mod.c
diff --git a/man/man8/.gitignore b/man/man8/.gitignore
index be7e9040f5..f2fc702147 100644
--- a/man/man8/.gitignore
+++ b/man/man8/.gitignore
@@ -1 +1,2 @@
 /zed.8
+/zfs-mount-generator.8
diff --git a/module/.gitignore b/module/.gitignore
index f81bf6e6d6..1ea8ef0bb8 100644
--- a/module/.gitignore
+++ b/module/.gitignore
@@ -6,6 +6,7 @@
 .*.cmd
 .*.d
 
+/.cache.mk
 /.tmp_versions
 /Module.markers
 /Module.symvers
diff --git a/module/Makefile.in b/module/Makefile.in
index 15c74e1305..4cd6988bba 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -54,6 +54,8 @@ clean:
 	if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
 	if [ -f Module.markers ]; then $(RM) Module.markers; fi
 
+	find . -name '*.ur-safe' -type f -print | xargs $(RM)
+
 modules_install:
 	@# Install the kernel modules
 	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \