Updated FSF addressalpha_0_6_90

25 files changed, 69 insertions, 48 deletions

diff --git a/sieve/Makefile.am b/sieve/Makefile.am
index 5703e4bf6..013e430e4 100644
--- a/sieve/Makefile.am
+++ b/sieve/Makefile.am
@@ -11,14 +11,14 @@
 ##   WITHOUT ANY WARRANTY; without even the implied warranty of
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ##   General Public License for more details.
 ##
 ##   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
 
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/include/mailutils/gnu @INTLINCS@
 SUBDIRS  = testsuite
 
 bin_PROGRAMS = sieve
 sieve_SOURCES = sieve.c
diff --git a/sieve/sieve.c b/sieve/sieve.c
index 75d3aa649..cb08f9ec8 100644
--- a/sieve/sieve.c
+++ b/sieve/sieve.c
@@ -10,13 +10,14 @@
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    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 */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
 #include <assert.h>
diff --git a/sieve/testsuite/Makefile.am b/sieve/testsuite/Makefile.am
index 67a2d22f6..2d9b37feb 100644
--- a/sieve/testsuite/Makefile.am
+++ b/sieve/testsuite/Makefile.am
@@ -11,14 +11,14 @@
 ##   WITHOUT ANY WARRANTY; without even the implied warranty of
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 ##   General Public License for more details.
 ##
 ##   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 = dejagnu
 DEJATOOL = sieve
 RUNTESTFLAGS = 
 CLEANFILES = *.log
 test_dirs = lib sieve scripts
diff --git a/sieve/testsuite/Redirect b/sieve/testsuite/Redirect
index c2a8738f5..e6d5976fc 100644
--- a/sieve/testsuite/Redirect
+++ b/sieve/testsuite/Redirect
@@ -10,13 +10,13 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
 TEST redirect.sv
 PATTERN BEGIN
 REDIRECT on msg uid 1: to gray@gnu.org
 REDIRECT on msg uid 2: to gray@gnu.org
diff --git a/sieve/testsuite/Reject b/sieve/testsuite/Reject
index 97f6d0385..eab5e4426 100644
--- a/sieve/testsuite/Reject
+++ b/sieve/testsuite/Reject
@@ -10,13 +10,13 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 
 TEST reject.sv
 PATTERN BEGIN
 REJECT on msg uid 1
 REJECT on msg uid 2
diff --git a/sieve/testsuite/lib/sieve.exp b/sieve/testsuite/lib/sieve.exp
index a5795a9fb..96df6731f 100644
--- a/sieve/testsuite/lib/sieve.exp
+++ b/sieve/testsuite/lib/sieve.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 source $top_srcdir/testsuite/lib/mailutils.exp
 set sieve_source_dir "${srcdir}/scripts"
 
 mu_init 
 set env(MAIL) $MU_SPOOL_DIR/sieve.mbox
diff --git a/sieve/testsuite/sieve/action.exp b/sieve/testsuite/sieve/action.exp
index 88e67d9ad..4de6ee97e 100644
--- a/sieve/testsuite/sieve/action.exp
+++ b/sieve/testsuite/sieve/action.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test stop.sv -pattern\
 "STOP on msg uid 1"\
 "STOP on msg uid 2"\
 "STOP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/address.exp b/sieve/testsuite/sieve/address.exp
index ea4b39ac3..d45f4c665 100644
--- a/sieve/testsuite/sieve/address.exp
+++ b/sieve/testsuite/sieve/address.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test addr_is_all.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/allof.exp b/sieve/testsuite/sieve/allof.exp
index 04523c94f..4875e8edb 100644
--- a/sieve/testsuite/sieve/allof.exp
+++ b/sieve/testsuite/sieve/allof.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test allof00.sv -pattern \
 "IMPLICIT KEEP on msg uid 1"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/anyof.exp b/sieve/testsuite/sieve/anyof.exp
index 2d7ae58df..2bc4e1749 100644
--- a/sieve/testsuite/sieve/anyof.exp
+++ b/sieve/testsuite/sieve/anyof.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test anyof00.sv -pattern \
 "IMPLICIT KEEP on msg uid 1"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/envelope.exp b/sieve/testsuite/sieve/envelope.exp
index 7b812881c..2287740be 100644
--- a/sieve/testsuite/sieve/envelope.exp
+++ b/sieve/testsuite/sieve/envelope.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test envelope1.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/exists.exp b/sieve/testsuite/sieve/exists.exp
index 9ef5e61a1..49c4ce619 100644
--- a/sieve/testsuite/sieve/exists.exp
+++ b/sieve/testsuite/sieve/exists.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test exists1.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/ext.exp b/sieve/testsuite/sieve/ext.exp
index 7d70ebea1..024b5d299 100644
--- a/sieve/testsuite/sieve/ext.exp
+++ b/sieve/testsuite/sieve/ext.exp
@@ -10,18 +10,19 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 mu_version
 if ![mu_check_capability HAVE_LIBLTDL] {
     exit 0
 }
 
 sieve_test -L "${top_builddir}/examples" -f ${MU_SPOOL_DIR}/bigto.mbox numaddr.sv -pattern \
 	"DISCARD on msg uid 1: marking as deleted"
 
-# End of ext.exp
\ No newline at end of file
+# End of ext.exp
diff --git a/sieve/testsuite/sieve/false.exp b/sieve/testsuite/sieve/false.exp
index 6006d3b13..cec2da680 100644
--- a/sieve/testsuite/sieve/false.exp
+++ b/sieve/testsuite/sieve/false.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test false.sv -pattern \
 "IMPLICIT KEEP on msg uid 1"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/header.exp b/sieve/testsuite/sieve/header.exp
index 57c560536..d832f7152 100644
--- a/sieve/testsuite/sieve/header.exp
+++ b/sieve/testsuite/sieve/header.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test header1.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/i-casemap.exp b/sieve/testsuite/sieve/i-casemap.exp
index 2f8aa7b74..24bda221d 100644
--- a/sieve/testsuite/sieve/i-casemap.exp
+++ b/sieve/testsuite/sieve/i-casemap.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test i-casemap-is.sv -pattern \
 	"DISCARD on msg uid 1: marking as deleted"\
 	"IMPLICIT KEEP on msg uid 2"\
 	"IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/i-numeric.exp b/sieve/testsuite/sieve/i-numeric.exp
index 13984d725..42de0b00a 100644
--- a/sieve/testsuite/sieve/i-numeric.exp
+++ b/sieve/testsuite/sieve/i-numeric.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test i-numeric-is.sv -pattern \
 	"IMPLICIT KEEP on msg uid 1"\
 	"DISCARD on msg uid 2: marking as deleted"\
 	"IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/i-octet.exp b/sieve/testsuite/sieve/i-octet.exp
index 63642d6d0..b7f9c58e3 100644
--- a/sieve/testsuite/sieve/i-octet.exp
+++ b/sieve/testsuite/sieve/i-octet.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test i-octet-is.sv -pattern \
 	"DISCARD on msg uid 1: marking as deleted"\
 	"IMPLICIT KEEP on msg uid 2"\
 	"IMPLICIT KEEP on msg uid 3"
 
diff --git a/sieve/testsuite/sieve/mul-addr.exp b/sieve/testsuite/sieve/mul-addr.exp
index d4be76a87..f6a2040dd 100644
--- a/sieve/testsuite/sieve/mul-addr.exp
+++ b/sieve/testsuite/sieve/mul-addr.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test -f $MU_SPOOL_DIR/relational.mbox mul-addr.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "DISCARD on msg uid 2: marking as deleted"\
 "DISCARD on msg uid 3: marking as deleted"\
 "DISCARD on msg uid 4: marking as deleted"\
diff --git a/sieve/testsuite/sieve/not.exp b/sieve/testsuite/sieve/not.exp
index 76483dd19..fa344a901 100644
--- a/sieve/testsuite/sieve/not.exp
+++ b/sieve/testsuite/sieve/not.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test not.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "DISCARD on msg uid 2: marking as deleted"\
 "DISCARD on msg uid 3: marking as deleted"
 
diff --git a/sieve/testsuite/sieve/redirect.exp b/sieve/testsuite/sieve/redirect.exp
index 918704d3a..ea4c97589 100644
--- a/sieve/testsuite/sieve/redirect.exp
+++ b/sieve/testsuite/sieve/redirect.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 set mtafile "$MU_FOLDER_DIR/mta.diag"
 set env(MTA_DIAG) "$mtafile"
 set env(MTA_APPEND) 1
 
 set mailer "sendmail:$top_builddir/examples/mta"
diff --git a/sieve/testsuite/sieve/reject.exp b/sieve/testsuite/sieve/reject.exp
index 648ff02d6..90a73a1f8 100644
--- a/sieve/testsuite/sieve/reject.exp
+++ b/sieve/testsuite/sieve/reject.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # 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.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 set mtafile "$MU_FOLDER_DIR/mta.diag"
 set env(MTA_DIAG) "$mtafile"
 set env(MTA_APPEND) 1
 
 set mailer "sendmail:$top_builddir/examples/mta"
diff --git a/sieve/testsuite/sieve/relational.exp b/sieve/testsuite/sieve/relational.exp
index 3f873f0e4..1a1c49fb9 100644
--- a/sieve/testsuite/sieve/relational.exp
+++ b/sieve/testsuite/sieve/relational.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test -f $MU_SPOOL_DIR/relational.mbox rel-address.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "IMPLICIT KEEP on msg uid 2"\
 "IMPLICIT KEEP on msg uid 3"\
 "IMPLICIT KEEP on msg uid 4"\
diff --git a/sieve/testsuite/sieve/size.exp b/sieve/testsuite/sieve/size.exp
index f2832800f..93ba0c399 100644
--- a/sieve/testsuite/sieve/size.exp
+++ b/sieve/testsuite/sieve/size.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test size1.sv -pattern \
 "IMPLICIT KEEP on msg uid 1"\
 "IMPLICIT KEEP on msg uid 2"\
 "DISCARD on msg uid 3: marking as deleted"
 
diff --git a/sieve/testsuite/sieve/true.exp b/sieve/testsuite/sieve/true.exp
index d38c27df1..11fe59af1 100644
--- a/sieve/testsuite/sieve/true.exp
+++ b/sieve/testsuite/sieve/true.exp
@@ -10,14 +10,15 @@
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #  
 # 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. 
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA.
 
 sieve_test true.sv -pattern \
 "DISCARD on msg uid 1: marking as deleted"\
 "DISCARD on msg uid 2: marking as deleted"\
 "DISCARD on msg uid 3: marking as deleted"