diff --git a/.gitignore b/.gitignore
index 3413abd559a..5e126990f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.swp
 *.deb
 *.rpm
+*.tar.xz
 *.gcda
 *.gcno
 *.gz
@@ -20,7 +21,6 @@ config.status
 contrib/syntax/files/example
 contrib/syntax/files/firejail-profile.lang
 contrib/syntax/files/firejail.vim
-firejail-*.tar.xz
 src/fnettrace-dns/fnettrace-dns
 src/fnettrace-sni/fnettrace-sni
 src/fnettrace-icmp/fnettrace-icmp
diff --git a/Makefile b/Makefile
index 4c87a120248..b15d16b6a74 100644
--- a/Makefile
+++ b/Makefile
@@ -173,21 +173,10 @@ clean:
 	$(MAKE) -C src/man clean
 	$(MAKE) -C test clean
 	rm -f $(SECCOMP_FILTERS)
-	rm -f firejail*.rpm
 	rm -f $(SYNTAX_FILES)
-	rm -f src/fnettrace/static-ip-map
-	rm -f test/utils/index.html*
-	rm -f test/utils/wget-log
-	rm -f test/utils/firejail-test-file*
-	rm -f test/utils/lstesting
-	rm -f test/environment/index.html*
-	rm -f test/environment/wget-log*
-	rm -fr test/environment/-testdir
-	rm -f test/environment/logfile*
-	rm -f test/environment/index.html
-	rm -f test/environment/wget-log
-	rm -f test/sysutils/firejail_t*
-	cd test/compile; ./compile.sh --clean; cd ../..
+	rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz
+	rm -f $(TARNAME)*.deb
+	rm -f $(TARNAME)*.rpm
 
 .PHONY: distclean
 distclean: clean
@@ -339,7 +328,6 @@ DISTFILES_TEST = \
 
 .PHONY: dist
 dist: clean config.mk
-	rm -fr $(TARNAME)-$(VERSION) $(TARNAME)-$(VERSION).tar.xz
 	mkdir -p $(TARNAME)-$(VERSION)/test
 	cp -a $(DISTFILES) $(TARNAME)-$(VERSION)
 	cp -a $(DISTFILES_TEST) $(TARNAME)-$(VERSION)/test
diff --git a/src/fnettrace/Makefile b/src/fnettrace/Makefile
index 2ad296d1d92..93ce9334d20 100644
--- a/src/fnettrace/Makefile
+++ b/src/fnettrace/Makefile
@@ -7,6 +7,8 @@ MOD_DIR = $(ROOT)/src/$(MOD)
 PROG = $(MOD_DIR)/$(MOD)
 TARGET = $(PROG)
 
+CLEANFILES += static-ip-map
+
 include $(ROOT)/src/prog.mk
 
 all: $(TARGET) static-ip-map
diff --git a/test/Makefile b/test/Makefile
index d7b1bac7a96..2ac6e4c6fd7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -12,3 +12,13 @@ $(TESTS):
 .PHONY: clean
 clean:
 	for test in $(TESTS); do rm -f "$$test/$$test.log"; done
+	rm -fr environment/-testdir
+	rm -f environment/index.html*
+	rm -f environment/logfile*
+	rm -f environment/wget-log*
+	rm -f sysutils/firejail_t*
+	rm -f utils/firejail-test-file*
+	rm -f utils/index.html*
+	rm -f utils/lstesting
+	rm -f utils/wget-log
+	cd compile && ./compile.sh --clean