--- Makefile.am.orig	Fri Feb 11 14:54:08 2005
+++ Makefile.am	Fri Feb 11 14:55:33 2005
@@ -10,7 +10,7 @@
 IMAP_INCLUDES = -I$(top_srcdir)/imap
 endif
 
-SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) . doc
+SUBDIRS = m4 po intl $(IMAP_SUBDIR) . doc
 
 bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
 
--- doc/Makefile.am.orig	2008-05-19 19:43:38.000000000 +0200
+++ doc/Makefile.am	2008-05-19 19:45:35.000000000 +0200
@@ -60,14 +60,6 @@
 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
 	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
 	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
-	for f in $(topsrcdir_DOCFILES) ; do \
-		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
-	done
-	for f in $(srcdir_DOCFILES) ; do \
-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
-	done
-	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir)
 	$(INSTALL) -m 644 Muttrc $(DESTDIR)$(sysconfdir)/Muttrc.dist
 	-if [ -f $(DESTDIR)$(pkgdatadir)/Muttrc ] ; then \
 		mv $(DESTDIR)$(pkgdatadir)/Muttrc* $(DESTDIR)$(sysconfdir) ; \