diff --git a/Makefile.am b/Makefile.am
index 83d6297..d999d09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,14 @@
-bin_SCRIPTS = sunrise-commit
-man1_MANS = sunrise-commit.1
+dist_bin_SCRIPTS = sunrise-commit
+dist_man1_MANS = sunrise-commit.1
+
+EXTRA_DIST = sunrise-commit.in sunrise-commit.1.in
+
+$(dist_bin_SCRIPTS) $(dist_man1_MANS): configure.ac
+	rm -f $@ $@.tmp
+	sed -e "s|@PACKAGE_STRING[@]|@PACKAGE_STRING@|" ${srcdir}/$@.in > $@.tmp
+	! [ -x $@ ] || chmod +x $@.tmp
+	chmod a-w $@.tmp
+	mv $@.tmp $@
+
+sunrise-commit: sunrise-commit.in
+sunrise-commit.1: sunrise-commit.1.in
diff --git a/configure.ac b/configure.ac
index e397680..617e740 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,5 +2,5 @@ AC_PREREQ([2.59])
 AC_INIT([sunrise-commit], [0.3])
 AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2 no-dependencies])
 
-AC_CONFIG_FILES([Makefile sunrise-commit sunrise-commit.1])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT