diff --git a/.gitignore b/.gitignore
index 7bb1ab5c5..bf737f7f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,8 @@ GSYMS
 GTAGS
 \#*#
 CVS
+!/.gitignore
+.gitignore
 .svn
 
 boot/boot
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 2cf2c4577..0f93e4a93 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -15,6 +15,7 @@
 ##### "all" and "depend" targets
 realinstall: realall
 realall: depend
+depend: .gitignore
 
 ##### Basic targets
 realinstall:	proginstall scriptsinstall
@@ -382,4 +383,7 @@ memalloc: realall
 	${INSTALL} ${INSTALLFLAGS} ${PROG}
 .endif
 
+.gitignore: Makefile
+	echo $(CLEANFILES) $(PROGS) | tr ' ' '\n' >.gitignore
+
 .endif	# HOSTPROG