--- contrib/Makefile.am.orig	Tue Jul 18 20:04:14 2006
+++ contrib/Makefile.am	Wed Aug 30 16:05:33 2006
@@ -1,6 +1,7 @@
 # $Id: Makefile.am,v 3.1 2006/07/18 18:04:14 brendan Exp $
 
 subdir = contrib
+samplesdir = @samplesdir@
 
 SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \
 	sample.muttrc  sample.mailcap sample.muttrc-tlr \
@@ -14,12 +15,12 @@
 	iconv/make.sh
 
 install-data-local:
-	$(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
 
 uninstall-local:
--- init.h.orig	Tue Mar  4 10:28:12 2003
+++ init.h	Wed Mar 26 15:41:19 2003
@@ -1455,8 +1455,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 only)
   */
   { "pgp_getkeys_command",	DT_STR, R_NONE, UL &PgpGetkeysCommand, 0},
@@ -1628,8 +1628,8 @@
   ** .de
   ** .pp
   ** For examples on how to configure these formats, see the smime.rc 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.
   ** (S/MIME only)
   */
   { "smime_verify_command", 	DT_STR, R_NONE, UL &SmimeVerifyCommand, 0},
--- Makefile.am.orig	Wed Aug 30 14:30:28 2006
+++ Makefile.am	Wed Aug 30 14:31:49 2006
@@ -13,7 +13,7 @@
 
 bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
 
-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) \
--- INSTALL.orig	Mon Nov 25 15:16:46 2002
+++ INSTALL	Wed Mar 26 15:59:57 2003
@@ -225,13 +225,13 @@
 need to tell mutt about implementation-defined names for some
 character sets.  Sample configuration files for various systems can
 be found in the directory contrib/iconv/ in this source
-distribution, and will be installed in the samples/iconv directory
+distribution, and will be installed in the share/examples/mutt/iconv directory
 as part of mutt's documentation.
 
 In order to use these sample configuration files, just put a line
 like
 
-     source /usr/local/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
+     source /usr/local/share/examples/mutt/iconv/iconv.osf1-4.0d.rc
 
 into your system's global Muttrc, which normally resides in /etc or
 /usr/local/etc.
--- doc/manual.txt.orig	Mon Aug 14 16:10:04 2006
+++ doc/manual.txt	Wed Aug 30 14:34:46 2006
@@ -5971,8 +5971,8 @@
 
    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. (PGP only)
+   share/examples/mutt/ subdirectory which has been installed on your system
+   alongside the documentation. (PGP only)
 
 3.163. pgp_getkeys_command
 
@@ -6164,8 +6164,8 @@
           "-CAfile $smime_ca_location".
 
    For examples on how to configure these formats, see the smime.rc in the
-   samples/ subdirectory which has been installed on your system alongside the
-   documentation. (S/MIME only)
+   share/examples/mutt/ subdirectory which has been installed on your system
+   alongside the documentation. (S/MIME only)
 
 3.182. smime_verify_command