diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..192fb094
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.bz2
diff --git a/conf.d/.gitignore b/conf.d/.gitignore
new file mode 100644
index 00000000..992ae129
--- /dev/null
+++ b/conf.d/.gitignore
@@ -0,0 +1 @@
+network
diff --git a/etc/.gitignore b/etc/.gitignore
new file mode 100644
index 00000000..6d86e6da
--- /dev/null
+++ b/etc/.gitignore
@@ -0,0 +1,3 @@
+rc.conf
+rc
+rc.shutdown
diff --git a/init.d/.gitignore b/init.d/.gitignore
new file mode 100644
index 00000000..18cff28b
--- /dev/null
+++ b/init.d/.gitignore
@@ -0,0 +1,25 @@
+bootmisc
+fsck
+hostname
+local
+localmount
+netmount
+network
+root
+savecache
+swap
+sysctl
+urandom
+devfs
+dmesg
+hwclock
+consolefont
+keymaps
+killprocs
+modules
+mount-ro
+mtab
+numlock
+procfs
+sysfs
+termencoding
diff --git a/man/Makefile b/man/Makefile
index 7ec0df20..5a63da82 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -18,7 +18,7 @@ MAKE_LINKS=	suffix=$${man\#*.}; \
 
 MK=		../mk
 include ${MK}/sys.mk
-include ${MK}/svnignore.mk
+include ${MK}/gitignore.mk
 
 all:
 
diff --git a/mk/dist.mk b/mk/dist.mk
index 179da847..abb2c696 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -2,6 +2,7 @@
 # Copyright 2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
+GITREF?=	HEAD
 DISTPREFIX?=	${NAME}-${VERSION}
 DISTFILE?=	${DISTPREFIX}.tar.bz2
 
@@ -14,9 +15,7 @@ SNAPDIR=	${DISTPREFIX}-${SNAP}
 SNAPFILE=	${SNAPDIR}.tar.bz2
 
 dist:
-	svn export . ${DISTPREFIX}
-	tar cjpf ${DISTFILE} ${DISTPREFIX}
-	rm -rf ${DISTPREFIX}
+	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
 
 snapshot:
 	rm -rf /tmp/${SNAPDIR}
diff --git a/mk/gitignore.mk b/mk/gitignore.mk
new file mode 100644
index 00000000..ed274497
--- /dev/null
+++ b/mk/gitignore.mk
@@ -0,0 +1,15 @@
+# rules to make .gitignore files
+# Copyright 2008 Roy Marples <roy@marples.name>
+# All rights reserved. Released under the 2-clause BSD license.
+
+IGNOREFILES+=   ${CLEANFILES}
+
+.PHONY:         .gitignore
+
+.gitignore:
+	@if test -n "${IGNOREFILES}"; then \
+		echo "Ignoring ${IGNOREFILES}"; \
+		echo ${IGNOREFILES} | tr ' ' '\n' > .gitignore; \
+	fi
+
+ignore: .gitignore
diff --git a/mk/lib.mk b/mk/lib.mk
index c5262383..e8b2eb7d 100644
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -64,4 +64,4 @@ extra_depend:
 include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/depend.mk
-include ${MK}/svnignore.mk
+include ${MK}/gitignore.mk
diff --git a/mk/prog.mk b/mk/prog.mk
index 3064e6e0..c44b380e 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -38,4 +38,4 @@ extra_depend:
 include ${MK}/sys.mk
 include ${MK}/os.mk
 include ${MK}/depend.mk
-include ${MK}/svnignore.mk
+include ${MK}/gitignore.mk
diff --git a/mk/scripts.mk b/mk/scripts.mk
index 663731b8..f65c1422 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -56,4 +56,4 @@ CLEANFILES+=	${OBJS}
 clean:
 	@if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi 
 
-include ${MK}/svnignore.mk
+include ${MK}/gitignore.mk
diff --git a/mk/svnignore.mk b/mk/svnignore.mk
deleted file mode 100644
index 1d2c6250..00000000
--- a/mk/svnignore.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# rules to make svn ignore files 
-# Copyright 2008 Roy Marples <roy@marples.name>
-# All rights reserved. Released under the 2-clause BSD license.
-
-IGNOREFILES+=	${CLEANFILES}
-
-ignore:
-	@if test -n "${IGNOREFILES}"; then \
-		echo "=> Ignoring ${IGNOREFILES}"; \
-		files="$$(echo "${IGNOREFILES}" | tr ' ' '\n')"; \
-		efiles="$$(svn propget svn:ignore .)"; \
-		sfiles="$$(printf "$${files}\n$${efiles}" | sort -u)"; \
-		eval svn propset svn:ignore \'"$${sfiles}"\' .; \
-	fi
diff --git a/runlevels/Makefile b/runlevels/Makefile
index 766a2cf3..5249ab52 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -14,7 +14,7 @@ INITDIR=	../init.d
 MK=		../mk
 include ${MK}/sys.mk
 include ${MK}/os.mk
-include ${MK}/svnignore.mk
+include ${MK}/gitignore.mk
 include Makefile.${OS}
 
 all:
diff --git a/sh/.gitignore b/sh/.gitignore
new file mode 100644
index 00000000..a76b2ac0
--- /dev/null
+++ b/sh/.gitignore
@@ -0,0 +1,7 @@
+functions.sh
+gendepends.sh
+init-common-post.sh
+rc-functions.sh
+runscript.sh
+init.sh
+init-early.sh
diff --git a/src/libeinfo/.gitignore b/src/libeinfo/.gitignore
new file mode 100644
index 00000000..a379710b
--- /dev/null
+++ b/src/libeinfo/.gitignore
@@ -0,0 +1,7 @@
+.depend
+libeinfo.o
+libeinfo.So
+libeinfo.a
+libeinfo.so.1
+libeinfo.so
+.depend
diff --git a/src/librc/.gitignore b/src/librc/.gitignore
new file mode 100644
index 00000000..460d8c9f
--- /dev/null
+++ b/src/librc/.gitignore
@@ -0,0 +1,16 @@
+.depend
+librc.o
+librc-daemon.o
+librc-depend.o
+librc-misc.o
+librc-stringlist.o
+librc.So
+librc-daemon.So
+librc-depend.So
+librc-misc.So
+librc-stringlist.So
+librc.a
+librc.so.1
+librc.so
+.depend
+rc.h
diff --git a/src/rc/.gitignore b/src/rc/.gitignore
new file mode 100644
index 00000000..d06e8579
--- /dev/null
+++ b/src/rc/.gitignore
@@ -0,0 +1,73 @@
+.depend
+version.h
+rc-status
+rc-service
+rc-update
+runscript
+start-stop-daemon
+einfon
+einfo
+ewarnn
+ewarn
+eerrorn
+eerror
+ebegin
+eend
+ewend
+eindent
+eoutdent
+esyslog
+eval_ecolors
+ewaitfile
+veinfo
+vewarn
+vebegin
+veend
+vewend
+veindent
+veoutdent
+service_starting
+service_started
+service_stopping
+service_stopped
+service_inactive
+service_wasinactive
+service_hotplugged
+service_started_daemon
+service_crashed
+checkpath
+fstabinfo
+mountinfo
+rc-depend
+service_get_value
+service_set_value
+get_options
+save_options
+shell_var
+is_newer_than
+is_older_than
+mark_service_starting
+mark_service_started
+mark_service_stopping
+mark_service_stopped
+mark_service_inactive
+mark_service_wasinactive
+mark_service_hotplugged
+mark_service_failed
+rc-abort
+checkpath.o
+fstabinfo.o
+mountinfo.o
+start-stop-daemon.o
+rc-applets.o
+rc-depend.o
+rc-logger.o
+rc-misc.o
+rc-plugin.o
+rc-service.o
+rc-status.o
+rc-update.o
+runscript.o
+rc.o
+rc
+.depend