Updated FSF addressalpha_0_6_90

48 files changed, 185 insertions, 141 deletions

diff --git a/include/Makefile.am b/include/Makefile.am
index 7023cf4..b509d1d 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -14,7 +14,7 @@
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
-##   Foundation, Inc.
-##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
 SUBDIRS=mailutils
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 1b05ad8..decc789 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -15,7 +15,8 @@
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   along with GNU Mailutils; if not, write to the Free Software
-##   Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##   Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
 BUILT_SOURCES=errno.h
 EXTRA_DIST=errno.hin
diff --git a/include/mailutils/address.h b/include/mailutils/address.h
index 14741a8..6914702 100644
--- a/include/mailutils/address.h
+++ b/include/mailutils/address.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_ADDRESS_H
 #define _MAILUTILS_ADDRESS_H
diff --git a/include/mailutils/argcv.h b/include/mailutils/argcv.h
index 911aa45..621bf33 100644
--- a/include/mailutils/argcv.h
+++ b/include/mailutils/argcv.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _ARGCV_H
 #define _ARGCV_H 1
diff --git a/include/mailutils/argp.h b/include/mailutils/argp.h
index 3bef63e..4be28b2 100644
--- a/include/mailutils/argp.h
+++ b/include/mailutils/argp.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_ARGP_H
 #define _MAILUTILS_ARGP_H
diff --git a/include/mailutils/attribute.h b/include/mailutils/attribute.h
index 965bf8f..b0280dc 100644
--- a/include/mailutils/attribute.h
+++ b/include/mailutils/attribute.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_ATTRIBUTE_H
 #define _MAILUTILS_ATTRIBUTE_H
diff --git a/include/mailutils/auth.h b/include/mailutils/auth.h
index e7a9ebd..b4332f0 100644
--- a/include/mailutils/auth.h
+++ b/include/mailutils/auth.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_AUTH_H
 #define _MAILUTILS_AUTH_H
diff --git a/include/mailutils/body.h b/include/mailutils/body.h
index d92f00f..fd8db9b 100644
--- a/include/mailutils/body.h
+++ b/include/mailutils/body.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_BODY_H
 #define _MAILUTILS_BODY_H
diff --git a/include/mailutils/daemon.h b/include/mailutils/daemon.h
index e3d3f26..f3960ac 100644
--- a/include/mailutils/daemon.h
+++ b/include/mailutils/daemon.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_DAEMON_H
 #define _MAILUTILS_DAEMON_H
diff --git a/include/mailutils/debug.h b/include/mailutils/debug.h
index 66c633a..cd43266 100644
--- a/include/mailutils/debug.h
+++ b/include/mailutils/debug.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_DEBUG_H
 #define _MAILUTILS_DEBUG_H
diff --git a/include/mailutils/envelope.h b/include/mailutils/envelope.h
index 0951f88..ddf8bed 100644
--- a/include/mailutils/envelope.h
+++ b/include/mailutils/envelope.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_ENVELOPE_H
 # define _MAILUTILS_ENVELOPE_H
diff --git a/include/mailutils/errno.hin b/include/mailutils/errno.hin
index 17fdce8..3b17310 100644
--- a/include/mailutils/errno.hin
+++ b/include/mailutils/errno.hin
@@ -15,7 +15,7 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA  */
 
 #ifndef _MAILUTILS_ERRNO_H
 #define _MAILUTILS_ERRNO_H	1
diff --git a/include/mailutils/error.h b/include/mailutils/error.h
index 43cb8bf..4f45924 100644
--- a/include/mailutils/error.h
+++ b/include/mailutils/error.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_ERROR_H
 #define _MAILUTILS_ERROR_H
diff --git a/include/mailutils/filter.h b/include/mailutils/filter.h
index e7d466e..ba51103 100644
--- a/include/mailutils/filter.h
+++ b/include/mailutils/filter.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_FILTER_H
 #define _MAILUTILS_FILTER_H
diff --git a/include/mailutils/folder.h b/include/mailutils/folder.h
index 4f69485..2fb88fe 100644
--- a/include/mailutils/folder.h
+++ b/include/mailutils/folder.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_FOLDER_H
 # define _MAILUTILS_FOLDER_H
diff --git a/include/mailutils/gnu/Makefile.am b/include/mailutils/gnu/Makefile.am
index 7be9fcb..a9ab563 100644
--- a/include/mailutils/gnu/Makefile.am
+++ b/include/mailutils/gnu/Makefile.am
@@ -14,8 +14,8 @@
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
-##   Foundation, Inc.
-##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
 AUTOMAKE_OPTIONS=no-dependencies
  
diff --git a/include/mailutils/gsasl.h b/include/mailutils/gsasl.h
index 6e735da..d68859a 100644
--- a/include/mailutils/gsasl.h
+++ b/include/mailutils/gsasl.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_GSASL_H
 #define _MAILUTILS_GSASL_H
diff --git a/include/mailutils/guile.h b/include/mailutils/guile.h
index 9e2dbf2..368d838 100644
--- a/include/mailutils/guile.h
+++ b/include/mailutils/guile.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MU_SCM_H
 #define _MU_SCM_H
diff --git a/include/mailutils/header.h b/include/mailutils/header.h
index 84d4d44..561de29 100644
--- a/include/mailutils/header.h
+++ b/include/mailutils/header.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_HEADER_H
 #define _MAILUTILS_HEADER_H
diff --git a/include/mailutils/iterator.h b/include/mailutils/iterator.h
index eadc048..144a7e2 100644
--- a/include/mailutils/iterator.h
+++ b/include/mailutils/iterator.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_ITERATOR_H
 #define _MAILUTILS_ITERATOR_H
diff --git a/include/mailutils/libsieve.h b/include/mailutils/libsieve.h
index b3f15af..f6031db 100644
--- a/include/mailutils/libsieve.h
+++ b/include/mailutils/libsieve.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_LIBSIEVE_H
 #define _MAILUTILS_LIBSIEVE_H
diff --git a/include/mailutils/list.h b/include/mailutils/list.h
index 0b1b402..a995169 100644
--- a/include/mailutils/list.h
+++ b/include/mailutils/list.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_LIST_H
 #define _MAILUTILS_LIST_H
diff --git a/include/mailutils/locker.h b/include/mailutils/locker.h
index f74e27e..9e7efaa 100644
--- a/include/mailutils/locker.h
+++ b/include/mailutils/locker.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_LOCKER_H
 #define _MAILUTILS_LOCKER_H
diff --git a/include/mailutils/mailbox.h b/include/mailutils/mailbox.h
index 015066e..e8ef1ab 100644
--- a/include/mailutils/mailbox.h
+++ b/include/mailutils/mailbox.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MAILBOX_H
 #define _MAILUTILS_MAILBOX_H
diff --git a/include/mailutils/mailcap.h b/include/mailutils/mailcap.h
index a871773..9819ce7 100644
--- a/include/mailutils/mailcap.h
+++ b/include/mailutils/mailcap.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MAILCAP_H
 #define _MAILUTILS_MAILCAP_H
diff --git a/include/mailutils/mailer.h b/include/mailutils/mailer.h
index 91c5758..2a24873 100644
--- a/include/mailutils/mailer.h
+++ b/include/mailutils/mailer.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MAILER_H
 #define _MAILUTILS_MAILER_H
diff --git a/include/mailutils/mailutils.h b/include/mailutils/mailutils.h
index 64df703..84db052 100644
--- a/include/mailutils/mailutils.h
+++ b/include/mailutils/mailutils.h
@@ -12,9 +12,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #include <mailutils/address.h>
 #include <mailutils/argcv.h>
diff --git a/include/mailutils/message.h b/include/mailutils/message.h
index e17be84..2a66eb6 100644
--- a/include/mailutils/message.h
+++ b/include/mailutils/message.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MESSAGE_H
 #define _MAILUTILS_MESSAGE_H
diff --git a/include/mailutils/mime.h b/include/mailutils/mime.h
index 10a168a..9f9bb17 100644
--- a/include/mailutils/mime.h
+++ b/include/mailutils/mime.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MIME_H
 #define _MAILUTILS_MIME_H
diff --git a/include/mailutils/monitor.h b/include/mailutils/monitor.h
index 5ca1607..d5d553a 100644
--- a/include/mailutils/monitor.h
+++ b/include/mailutils/monitor.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MONITOR_H
 #define _MAILUTILS_MONITOR_H
diff --git a/include/mailutils/mu_auth.h b/include/mailutils/mu_auth.h
index 7fa0731..9a3770c 100644
--- a/include/mailutils/mu_auth.h
+++ b/include/mailutils/mu_auth.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MU_AUTH_H
 #define _MAILUTILS_MU_AUTH_H
diff --git a/include/mailutils/mutil.h b/include/mailutils/mutil.h
index 9ca65b2..f2a33db 100644
--- a/include/mailutils/mutil.h
+++ b/include/mailutils/mutil.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_MUTIL_H
 #define _MAILUTILS_MUTIL_H
@@ -61,13 +62,13 @@ extern char * mu_tilde_expansion __P ((const char *ref, const char *delim, const
 extern size_t mu_cpystr __P ((char *dst, const char *src, size_t size));
 
 /* Get the host name, doing a gethostbyname() if possible.
- *
+ *  
  * It is the caller's responsibility to free host.
  */
 extern int mu_get_host_name __P((char **host));
 
 /* Set the default user email address.
- *
+ *  
  * Subsequent calls to mu_get_user_email() with a NULL name will return this
  * email address.  email is parsed to determine that it consists of a a valid
  * rfc822 address, with one valid addr-spec, i.e, the address must be
@@ -76,7 +77,7 @@ extern int mu_get_host_name __P((char **host));
 extern int mu_set_user_email __P ((const char *email));
 
 /* Set the default user email address domain.
- *
+ *  
  * Subsequent calls to mu_get_user_email() with a non-null name will return
  * email addresses in this domain (name@domain). It should be fully
  * qualified, but this isn't (and can't) be enforced.
@@ -89,7 +90,7 @@ extern int mu_get_user_email_domain __P ((const char** domain));
 /*
  * Get the default email address for user name. A NULL name is taken
  * to mean the current user.
- *
+ *  
  * The result must be freed by the caller after use.
  */
 extern char *mu_get_user_email __P ((const char *name));
diff --git a/include/mailutils/nls.h b/include/mailutils/nls.h
index dad6a3d..6aaed36 100644
--- a/include/mailutils/nls.h
+++ b/include/mailutils/nls.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_NLS_H
 #define _MAILUTILS_NLS_H
diff --git a/include/mailutils/nntp.h b/include/mailutils/nntp.h
index f2f7d1f..06d52bc 100644
--- a/include/mailutils/nntp.h
+++ b/include/mailutils/nntp.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_NNTP_H
 #define _MAILUTILS_NNTP_H
diff --git a/include/mailutils/observer.h b/include/mailutils/observer.h
index 1e91812..eb2c1d7 100644
--- a/include/mailutils/observer.h
+++ b/include/mailutils/observer.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_OBSERVER_H
 #define _MAILUTILS_OBSERVER_H
diff --git a/include/mailutils/parse822.h b/include/mailutils/parse822.h
index 6f747ac..1799520 100644
--- a/include/mailutils/parse822.h
+++ b/include/mailutils/parse822.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 /**
 * Parses syntatic elements defined in RFC 822.
diff --git a/include/mailutils/pop3.h b/include/mailutils/pop3.h
index 49c4a00..17a143b 100644
--- a/include/mailutils/pop3.h
+++ b/include/mailutils/pop3.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_POP3_H
 #define _MAILUTILS_POP3_H
diff --git a/include/mailutils/property.h b/include/mailutils/property.h
index 6eb9173..32d6417 100644
--- a/include/mailutils/property.h
+++ b/include/mailutils/property.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_PROPERTY_H
 #define _MAILUTILS_PROPERTY_H
diff --git a/include/mailutils/refcount.h b/include/mailutils/refcount.h
index d4a4bf2..a29da26 100644
--- a/include/mailutils/refcount.h
+++ b/include/mailutils/refcount.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_REFCOUNT_H
 #define _MAILUTILS_REFCOUNT_H
diff --git a/include/mailutils/registrar.h b/include/mailutils/registrar.h
index 6e64b04..cc34397 100644
--- a/include/mailutils/registrar.h
+++ b/include/mailutils/registrar.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_REGISTRAR_H
 #define _MAILUTILS_REGISTRAR_H
diff --git a/include/mailutils/sql.h b/include/mailutils/sql.h
index cb2c32b..c1cbf14 100644
--- a/include/mailutils/sql.h
+++ b/include/mailutils/sql.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_SQL_H
 #define _MAILUTILS_SQL_H
diff --git a/include/mailutils/stream.h b/include/mailutils/stream.h
index 0edcba7..7c2fba3 100644
--- a/include/mailutils/stream.h
+++ b/include/mailutils/stream.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_STREAM_H
 # define _MAILUTILS_STREAM_H
diff --git a/include/mailutils/sys/Makefile.am b/include/mailutils/sys/Makefile.am
index 77b2ac0..4ea7e43 100644
--- a/include/mailutils/sys/Makefile.am
+++ b/include/mailutils/sys/Makefile.am
@@ -14,6 +14,6 @@
 ##
 ##   You should have received a copy of the GNU General Public License
 ##   along with this program; if not, write to the Free Software
-##   Foundation, Inc.
-##   59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+##   Foundation, Inc.  51 Franklin Street, Fifth Floor, Boston, MA
+##   02110-1301 USA
 
diff --git a/include/mailutils/sys/nntp.h b/include/mailutils/sys/nntp.h
index 0f98dd2..2449bf4 100644
--- a/include/mailutils/sys/nntp.h
+++ b/include/mailutils/sys/nntp.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_SYS_NNTP_H
 #define _MAILUTILS_SYS_NNTP_H
diff --git a/include/mailutils/sys/pop3.h b/include/mailutils/sys/pop3.h
index 5785c70..f5ed4e2 100644
--- a/include/mailutils/sys/pop3.h
+++ b/include/mailutils/sys/pop3.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_SYS_POP3_H
 #define _MAILUTILS_SYS_POP3_H
diff --git a/include/mailutils/tls.h b/include/mailutils/tls.h
index 99720c1..2e79d56 100644
--- a/include/mailutils/tls.h
+++ b/include/mailutils/tls.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_TLS_H
 #define _MAILUTILS_TLS_H
diff --git a/include/mailutils/types.h b/include/mailutils/types.h
index ce059de..4d5da1c 100644
--- a/include/mailutils/types.h
+++ b/include/mailutils/types.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_TYPES_H
 #define _MAILUTILS_TYPES_H
diff --git a/include/mailutils/url.h b/include/mailutils/url.h
index 6474645..05f2e60 100644
--- a/include/mailutils/url.h
+++ b/include/mailutils/url.h
@@ -11,9 +11,10 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA  */
+   You should have received a copy of the GNU Lesser General
+   Public License along with this library; if not, write to the
+   Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301 USA */
 
 #ifndef _MAILUTILS_URL_H
 #define _MAILUTILS_URL_H	1