diff --git a/ChangeLog b/ChangeLog
index 32eb5cdabab88cea4ae3c7feac57d9cbd308bb6e..f694af5db8f365bbf1a30ae8e4fe66a07467d4d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,6 +44,7 @@ version 1.0 -- UNRELEASED
 	 . Workaround automake sanity check that would prevent us from
 	   installing lib/* into lib/backupninja/. Where else are be supposed
 	   to install such files anyway?
+	 . Have "make dist" ship handlers/*.in instead of make results.
     documentation changes
 	 . Document what features available to .sh jobs (Redmine #1558).
 
diff --git a/handlers/Makefile.am b/handlers/Makefile.am
index 54155e89214f87e224216c2a8c1e7e48e4c1878a..6c1969bdab2e71fdd6f5a60ec2782c8eea5aa5d5 100644
--- a/handlers/Makefile.am
+++ b/handlers/Makefile.am
@@ -3,16 +3,20 @@ HANDLERS = dup dup.helper maildir makecd		\
          makecd.helper mysql mysql.helper pgsql pgsql.helper rdiff	\
          rdiff.helper rsync sh svn sys sys.helper trac tar tar.helper
 
+DIST_HANDLERS = dup.in dup.helper.in maildir.in makecd.in		\
+         makecd.helper.in mysql.in mysql.helper.in pgsql.in pgsql.helper.in rdiff.in	\
+         rdiff.helper.in rsync.in sh.in svn.in sys.in sys.helper.in trac.in tar.in tar.helper.in wget
+
 CLEANFILES = $(HANDLERS)
 
-EXTRA_DIST = Makefile.am $(HANDLERS)
+EXTRA_DIST = Makefile.am $(DIST_HANDLERS)
 
 edit = sed \
     -e "s,@BASH\@,$(BASH),g" \
     -e "s,@AWK\@,$(AWK),g" \
     -e "s,@SED\@,$(SED),g" 
 
-dist_pkgdata_DATA = $(HANDLERS)
+dist_pkgdata_DATA = $(DIST_HANDLERS)
 
 dup: $(srcdir)/dup.in
 	rm -f dup