diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8359151
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes	export-ignore
+.gitignore	export-ignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..605b2d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+arch-chroot
+genfstab
+pacstrap
+arch-install-scripts-*.tar.gz*
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..2a81410
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+V=20120618
+
+PREFIX = /usr/local
+
+BINPROGS = arch-chroot genfstab pacstrap
+
+all: $(BINPROGS)
+
+%: %.in Makefile common
+	@echo "GEN $@"
+	@$(RM) "$@"
+	@m4 -P $@.in >$@
+	@chmod a-w "$@"
+	@chmod +x "$@"
+
+clean:
+	rm -f $(BINPROGS)
+
+install:
+	install -dm0755 $(DESTDIR)$(PREFIX)/bin
+	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
+
+uninstall:
+	for f in ${BINPROGS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
+
+dist:
+	git archive --format=tar --prefix=arch-install-scripts-$(V)/ $(V) | gzip -9 > arch-install-scripts-$(V).tar.gz
+	gpg --detach-sign --use-agent arch-install-scripts-$(V).tar.gz
+
+.PHONY: all clean install uninstall dist
diff --git a/arch-chroot b/arch-chroot.in
old mode 100755
new mode 100644
similarity index 95%
rename from arch-chroot
rename to arch-chroot.in
index 1d2bb93..bff6c68
--- a/arch-chroot
+++ b/arch-chroot.in
@@ -2,7 +2,7 @@
 
 shopt -s extglob
 
-. ./common
+m4_include(common)
 
 usage() {
   cat <<EOF
diff --git a/common b/common
index 68ceb32..9e462e3 100644
--- a/common
+++ b/common
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 out() { printf "$1 $2\n" "${@:3}"; }
 error() { out "==> ERROR:" "$@"; }
 msg() { out "==>" "$@"; }
@@ -71,7 +69,6 @@ fstype_is_pseudofs() {
                         'spufs'
                         'sysfs'
                         'tmpfs')
-
   in_array "$1" "${pseudofs_types[@]}"
 }
 
diff --git a/genfstab b/genfstab.in
old mode 100755
new mode 100644
similarity index 99%
rename from genfstab
rename to genfstab.in
index 8096297..3f781d9
--- a/genfstab
+++ b/genfstab.in
@@ -2,7 +2,7 @@
 
 shopt -s extglob
 
-. ./common
+m4_include(common)
 
 # we need this because %q isn't the opposite of %b
 mangle() {
diff --git a/pacstrap b/pacstrap.in
old mode 100755
new mode 100644
similarity index 98%
rename from pacstrap
rename to pacstrap.in
index a964f9b..95d63b1
--- a/pacstrap
+++ b/pacstrap.in
@@ -10,7 +10,7 @@
 
 shopt -s extglob
 
-source ./common
+m4_include(common)
 
 declare newroot=/mnt