diff --git a/.gitignore b/.gitignore
index 46fdb468..d5b086c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-*.bz2
 openrc-0.1.tar.bz2
diff --git a/init.d.misc/.gitignore b/init.d.misc/.gitignore
new file mode 100644
index 00000000..5dd6a2e6
--- /dev/null
+++ b/init.d.misc/.gitignore
@@ -0,0 +1,9 @@
+avahi-dnsconfd
+avahid
+dbus
+hald
+named
+ntpd
+openvpn
+polkitd
+sshd
diff --git a/init.d.misc/Makefile b/init.d.misc/Makefile
index 100c701c..a9acd8c2 100644
--- a/init.d.misc/Makefile
+++ b/init.d.misc/Makefile
@@ -1,6 +1,7 @@
 DIR=	/etc/init.d
-SRCS=	avahi-dnsconfd.in avahi.in dbus.in hald.in named.in ntpd.in \
+SRCS=	avahi-dnsconfd.in avahid.in dbus.in hald.in named.in ntpd.in \
 	openvpn.in polkitd.in sshd.in
 
+MK=	../mk
 include ${MK}/scripts.mk
 include Makefile.${OS}
diff --git a/mk/gitignore.mk b/mk/gitignore.mk
index fca262be..09139b0e 100644
--- a/mk/gitignore.mk
+++ b/mk/gitignore.mk
@@ -6,13 +6,9 @@ IGNOREFILES+=	${CLEANFILES}
 .PHONY:		.gitignore
 
 .gitignore:
-	@if test -n "${IGNOREFILES}"; then echo "Ignoring ${IGNOREFILES}"; fi
-	@for obj in ${IGNOREFILES}; do \
-		if ! test -r .gitignore; then \
-			echo "$${obj}" > .gitignore || exit $$?; \
-		elif ! grep -q "^$${obj}$$" .gitignore; then \
-			echo "$${obj}" >> .gitignore || exit $$?; \
-		fi; \
-	done
+	@if test -n "${IGNOREFILES}"; then \
+		echo "Ignoring ${IGNOREFILES}"; \
+		echo ${IGNOREFILES} | tr ' ' '\n' > .gitignore; \
+	fi
 
 gitignore: .gitignore
diff --git a/src/libeinfo/.gitignore b/src/libeinfo/.gitignore
index b4fca0e2..a379710b 100644
--- a/src/libeinfo/.gitignore
+++ b/src/libeinfo/.gitignore
@@ -4,3 +4,4 @@ libeinfo.So
 libeinfo.a
 libeinfo.so.1
 libeinfo.so
+.depend
diff --git a/src/librc/.gitignore b/src/librc/.gitignore
index 8ebb1826..5f6e3ee2 100644
--- a/src/librc/.gitignore
+++ b/src/librc/.gitignore
@@ -12,3 +12,4 @@ librc-strlist.So
 librc.a
 librc.so.1
 librc.so
+.depend
diff --git a/src/rc/.gitignore b/src/rc/.gitignore
index 17d975c1..eaa7de9e 100644
--- a/src/rc/.gitignore
+++ b/src/rc/.gitignore
@@ -66,3 +66,4 @@ rc.o
 runscript.o
 start-stop-daemon.o
 rc
+.depend