diff -x '*~' -Nru automake-1.9.6.orig/automake.in automake-1.9.6/automake.in
--- automake-1.9.6.orig/automake.in	2006-03-05 18:06:26.490555000 +0100
+++ automake-1.9.6/automake.in	2006-03-05 18:32:09.314975500 +0100
@@ -3451,7 +3451,7 @@
     {
       my $archive_defined = option 'no-dist-gzip' ? 0 : 1;
       $archive_defined ||=
-	grep { option "dist-$_" } ('shar', 'zip', 'tarZ', 'bzip2');
+	grep { option "dist-$_" } ('shar', 'zip', 'tarZ', 'bzip2', '7zip');
       error (option 'no-dist-gzip',
 	     "no-dist-gzip specified but no dist-* specified, "
 	     . "at least one archive format must be enabled")
@@ -6103,6 +6103,7 @@
 		 'MAINTAINER-MODE'
 		 => $seen_maint_mode ? subst ('MAINTAINER_MODE_TRUE') : '',
 
+		 '7ZIP'        => !! option 'dist-7zip',
 		 'BZIP2'       => !! option 'dist-bzip2',
 		 'COMPRESS'    => !! option 'dist-tarZ',
 		 'GZIP'        =>  ! option 'no-dist-gzip',
diff -x '*~' -Nru automake-1.9.6.orig/lib/am/distdir.am automake-1.9.6/lib/am/distdir.am
--- automake-1.9.6.orig/lib/am/distdir.am	2005-05-14 22:21:06.000000000 +0200
+++ automake-1.9.6/lib/am/distdir.am	2006-03-05 18:34:46.956827500 +0100
@@ -267,6 +267,13 @@
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__remove_distdir)
 
+?7ZIP?DIST_ARCHIVES += $(distdir).tar.7z
+.PHONY: dist-7zip
+dist-7zip: distdir
+	-rm -f $(distdir).tar.7z
+	tardir=$(distdir) && $(am__tar) | 7z -bd -m0=lzma -mx=9 a -si $(distdir).tar.7z
+	$(am__remove_distdir)
+
 ?ZIP?DIST_ARCHIVES += $(distdir).zip
 .PHONY: dist-zip
 dist-zip: distdir
@@ -293,6 +300,8 @@
 ?BZIP2?	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 ?COMPRESS?	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 ?SHAR?	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+?7ZIP?	-rm -f $(distdir).tar.7z
+?7ZIP?	tardir=$(distdir) && $(am__tar) | 7z -bd -m0=lzma -mx=9 a -si $(distdir).tar.7z
 ?ZIP?	-rm -f $(distdir).zip
 ?ZIP?	zip -rq $(distdir).zip $(distdir)
 	$(am__remove_distdir)