--- contrib/Makefile.in.orig	Mon Jun  4 19:14:31 2001
+++ contrib/Makefile.in	Wed Mar 26 11:45:15 2003
@@ -12,6 +12,7 @@
 mandir = @mandir@
 srcdir = @srcdir@
 docdir = @docdir@
+samplesdir = @samplesdir@
 top_srcdir = @top_srcdir@
 top_builddir = ..
 INSTALL = @INSTALL@
@@ -37,12 +38,12 @@
 check:
 
 install:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv
 	for f in $(SAMPLES) ; do \
-		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ;	\
+		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir);	\
 	done
 	for f in $(srcdir)/iconv/*.rc ; do					\
-		$(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv	  ;	\
+		$(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv	  ;	\
 	done
 
 # Nothing needs to be done - uninstall in doc removes samples as well.
--- init.h.orig	Wed Mar 26 11:50:36 2003
+++ init.h	Wed Mar 26 12:54:37 2003
@@ -1347,8 +1347,8 @@
   ** .pp
   ** For examples on how to configure these formats for the various versions
   ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in
-  ** the samples/ subdirectory which has been installed on your system
-  ** alongside the documentation.
+  ** the share/examples/mutt subdirectory which has been installed on your
+  ** system.
   */
   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
   /*
--- Makefile.am.orig	Wed Mar 26 13:13:10 2003
+++ Makefile.am	Wed Mar 26 13:25:40 2003
@@ -13,7 +13,7 @@
 
 bin_SCRIPTS = muttbug flea
 
-BUILT_SOURCES = keymap_defs.h patchlist.c
+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc
 
 bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
 mutt_SOURCES = $(BUILT_SOURCES) \