--- ./doc/pine.1.orig	2005-04-28 11:28:42.000000000 -0700
+++ ./doc/pine.1	2005-07-26 23:05:27.000000000 -0700
@@ -333,11 +333,11 @@
 .br
 /etc/mime.types	System-wide file ext. to MIME type mapping
 .br
-/usr/local/lib/pine.info	Local pointer to system administrator.
+/etc/pine.info	Local pointer to system administrator.
 .br
-/usr/local/lib/pine.conf	System-wide configuration file.
+/etc/pine.conf	System-wide configuration file.
 .br
-/usr/local/lib/pine.conf.fixed	 Non-overridable configuration file.
+/etc/pine.conf.fixed	 Non-overridable configuration file.
 .br
 /tmp/.\\usr\\spool\\mail\\xxxx	Per-folder mailbox lock files.
 .br
--- ./doc/tech-notes/config-notes.html.orig	2005-03-24 11:47:57.000000000 -0800
+++ ./doc/tech-notes/config-notes.html	2005-07-26 23:05:27.000000000 -0700
@@ -1253,8 +1253,8 @@
 
 <LI> An entry in <CODE>/etc/inetd.conf</CODE> for the alternate service.
 
-<LI> An entry in <CODE>/usr/local/lib/pine.conf</CODE>,
-<CODE>/usr/local/lib/pine.conf.fixed</CODE> or <CODE>~/.pinerc</CODE>. 
+<LI> An entry in <CODE>/etc/pine.conf</CODE>,
+<CODE>/etc/pine.conf.fixed</CODE> or <CODE>~/.pinerc</CODE>. 
 
 </UL>
 
@@ -1265,7 +1265,7 @@
 <EM>Pine</EM>'s MIME-TYPE support is based on code contributed by Hans Drexler
 &LT;drexler@mpi.nl&GT;.  <EM>Pine</EM> assigns MIME Content-Types according
 to file name extensions found in the system-wide files
-<CODE>/usr/local/lib/mime.types</CODE> and <CODE>/etc/mime.types</CODE>,
+<CODE>/etc/mime.types</CODE> and <CODE>/etc/mime.types</CODE>,
 and a user specific <CODE>~/.mime.types</CODE> file.  <P>
 
 In DOS and OS/2,
--- ./doc/tech-notes/installation.html.orig	2003-02-05 19:04:26.000000000 -0800
+++ ./doc/tech-notes/installation.html	2005-07-26 23:05:27.000000000 -0700
@@ -218,7 +218,7 @@
 <DD> The name of the file which holds <EM>Pine</EM>
 configuration information for
 all users on the system.  Default on UNIX systems is
-<CODE>/usr/local/lib/pine.conf</CODE>.
+<CODE>/etc/pine.conf</CODE>.
 
 <DT> SYSTEM_PINERC_FIXED
 
@@ -226,7 +226,7 @@
 SYSTEM_PINERC, but only for variables that the administrator wants to keep
 fixed.  That is, users are not allowed to change variables that are
 specified in the FIXED file.  Default on UNIX systems is
-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.
+<CODE>/etc/pine.conf.fixed</CODE>.
 
 </DL> <P>
 
@@ -529,9 +529,9 @@
 are no <STRONG>required</STRONG> auxiliary files.  <P>
 
 There are, however, three optional auxiliary files: 
-<CODE>/usr/local/lib/pine.info</CODE>,
-<CODE>/usr/local/lib/pine.conf</CODE>, and
-<CODE>/usr/local/lib/pine.conf.fixed</CODE>.  The file
+<CODE>/etc/pine.info</CODE>,
+<CODE>/etc/pine.conf</CODE>, and
+<CODE>/etc/pine.conf.fixed</CODE>.  The file
 <CODE>pine.info</CODE> contains text on how to get further help on the
 local system.  It is part of the help text for the
 main menu and should probably refer to the local help desk or the system
@@ -650,15 +650,15 @@
 
 <DL COMPACT>
 
-<DT> /usr/local/lib/pine.conf
+<DT> /etc/pine.conf
 
 <DD> Pine's global configuration file. 
 
-<DT> /usr/local/lib/pine.conf.fixed
+<DT> /etc/pine.conf.fixed
 
 <DD> Non-overridable global configuration file. 
 
-<DT> /usr/local/lib/pine.info
+<DT> /etc/pine.info
 
 <DD> Local pointer to system administrator. 
 
--- ./pine/osdep/os-lnx.h.orig	2003-05-23 09:07:00.000000000 -0700
+++ ./pine/osdep/os-lnx.h	2005-07-26 23:05:27.000000000 -0700
@@ -163,10 +163,10 @@
 
 /*----- System-wide config file ----------------------------------------*/
 #ifndef SYSTEM_PINERC
-#define SYSTEM_PINERC             "/usr/local/lib/pine.conf"
+#define SYSTEM_PINERC             "/etc/pine.conf"
 #endif
 #ifndef SYSTEM_PINERC_FIXED
-#define SYSTEM_PINERC_FIXED       "/usr/local/lib/pine.conf.fixed"
+#define SYSTEM_PINERC_FIXED       "/etc/pine.conf.fixed"
 #endif
 
 
--- ./pine/init.c.orig	2005-04-07 11:01:42.000000000 -0700
+++ ./pine/init.c	2005-07-26 23:05:27.000000000 -0700
@@ -428,7 +428,7 @@
 
 /*----------------------------------------------------------------------
 These are the variables that control a number of pine functions.  They
-come out of the .pinerc and the /usr/local/lib/pine.conf files.  Some can
+come out of the .pinerc and the /etc/pine.conf files.  Some can
 be set by the user while in Pine.  Eventually all the local ones should
 be so and maybe the global ones too.