diff --git a/.gitignore b/.gitignore
index e7c639ca..35665e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,4 +32,4 @@ Defaults.mk
 /etc/wwapid.config
 /etc/wwapic.config
 /etc/wwapird.config
-
+.dist/
diff --git a/Makefile b/Makefile
index 60ec87c6..b262091c 100644
--- a/Makefile
+++ b/Makefile
@@ -246,6 +246,7 @@ dist: vendor config
 	rm -rf .dist/$(WAREWULF)-$(VERSION)
 	mkdir -p .dist/$(WAREWULF)-$(VERSION)
 	cp -rap * .dist/$(WAREWULF)-$(VERSION)/
+	find .dist/$(WAREWULF)-$(VERSION)/ -type f -name '*~' -delete
 	cd .dist; tar -czf ../$(WAREWULF)-$(VERSION).tar.gz $(WAREWULF)-$(VERSION)
 	rm -rf .dist