From a8812e2857e2551ba5a53fd231ed022182ee071d Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 5 Sep 2006 18:00:19 +0000
Subject: [PATCH] svn merge -r9136:9169
 https://eris.llnl.gov/svn/slurm/branches/slurm-1.1

---
 COPYING                                       |  4 +--
 DISCLAIMER                                    |  2 +-
 NEWS                                          | 10 ++++++
 doc/html/configurator.html                    |  2 +-
 doc/man/Makefile.am                           |  6 ++--
 doc/man/Makefile.in                           |  6 ++--
 doc/man/man8/slurmstepd.8                     | 31 +++++++++++++++++++
 slurm/slurm.h.in                              |  2 +-
 slurm/slurm_errno.h                           |  2 +-
 slurm/spank.h                                 |  2 +-
 src/api/Makefile.am                           |  2 +-
 src/api/Makefile.in                           |  2 +-
 src/api/allocate.c                            |  2 +-
 src/api/cancel.c                              |  2 +-
 src/api/checkpoint.c                          |  2 +-
 src/api/complete.c                            |  2 +-
 src/api/config_info.c                         |  2 +-
 src/api/init_msg.c                            |  2 +-
 src/api/job_info.c                            | 20 ++++++------
 src/api/job_info.h                            |  2 +-
 src/api/job_step_info.c                       |  2 +-
 src/api/node_info.c                           |  2 +-
 src/api/node_select_info.c                    |  2 +-
 src/api/node_select_info.h                    |  2 +-
 src/api/partition_info.c                      |  2 +-
 src/api/pmi.c                                 |  2 +-
 src/api/reconfigure.c                         |  2 +-
 src/api/signal.c                              |  2 +-
 src/api/slurm_pmi.c                           |  2 +-
 src/api/slurm_pmi.h                           |  2 +-
 src/api/spawn.c                               |  2 +-
 src/api/submit.c                              |  2 +-
 src/api/suspend.c                             |  2 +-
 src/api/update_config.c                       |  2 +-
 src/common/arg_desc.c                         |  2 +-
 src/common/arg_desc.h                         |  2 +-
 src/common/bitstring.c                        |  2 +-
 src/common/bitstring.h                        |  2 +-
 src/common/cbuf.c                             |  2 +-
 src/common/cbuf.h                             |  2 +-
 src/common/checkpoint.c                       |  2 +-
 src/common/checkpoint.h                       |  2 +-
 src/common/daemonize.c                        |  2 +-
 src/common/daemonize.h                        |  2 +-
 src/common/eio.c                              |  2 +-
 src/common/eio.h                              |  2 +-
 src/common/env.c                              |  2 +-
 src/common/env.h                              |  2 +-
 src/common/fd.c                               |  2 +-
 src/common/fd.h                               |  2 +-
 src/common/forward.c                          |  2 +-
 src/common/forward.h                          |  2 +-
 src/common/getopt.c                           |  4 +--
 src/common/getopt.h                           |  4 +--
 src/common/getopt1.c                          |  4 +--
 src/common/global_srun.c                      |  2 +-
 src/common/global_srun.h                      |  2 +-
 src/common/hostlist.c                         |  2 +-
 src/common/hostlist.h                         |  2 +-
 src/common/io_hdr.c                           |  2 +-
 src/common/io_hdr.h                           |  2 +-
 src/common/job_options.c                      |  2 +-
 src/common/job_options.h                      |  2 +-
 src/common/list.c                             |  2 +-
 src/common/list.h                             |  2 +-
 src/common/macros.h                           |  2 +-
 src/common/mpi.c                              |  2 +-
 src/common/mpi.h                              |  2 +-
 src/common/net.c                              |  2 +-
 src/common/net.h                              |  2 +-
 src/common/node_select.c                      |  2 +-
 src/common/node_select.h                      |  2 +-
 src/common/optz.c                             |  2 +-
 src/common/optz.h                             |  2 +-
 src/common/pack.c                             |  2 +-
 src/common/pack.h                             |  2 +-
 src/common/parse_config.c                     |  2 +-
 src/common/parse_config.h                     |  2 +-
 src/common/parse_spec.c                       |  2 +-
 src/common/parse_spec.h                       |  2 +-
 src/common/parse_time.c                       |  2 +-
 src/common/parse_time.h                       |  2 +-
 src/common/plugin.c                           |  2 +-
 src/common/plugin.h                           |  2 +-
 src/common/plugrack.c                         |  2 +-
 src/common/plugrack.h                         |  2 +-
 src/common/plugstack.c                        |  2 +-
 src/common/plugstack.h                        |  2 +-
 src/common/read_config.c                      |  2 +-
 src/common/read_config.h                      |  2 +-
 src/common/safeopen.c                         |  2 +-
 src/common/safeopen.h                         |  2 +-
 src/common/slurm_auth.c                       |  2 +-
 src/common/slurm_auth.h                       |  2 +-
 src/common/slurm_cred.c                       |  2 +-
 src/common/slurm_cred.h                       |  2 +-
 src/common/slurm_errno.c                      |  2 +-
 src/common/slurm_jobacct.c                    |  2 +-
 src/common/slurm_jobacct.h                    |  2 +-
 src/common/slurm_jobcomp.c                    |  2 +-
 src/common/slurm_jobcomp.h                    |  2 +-
 src/common/slurm_protocol_api.c               |  2 +-
 src/common/slurm_protocol_api.h               |  2 +-
 src/common/slurm_protocol_common.h            |  2 +-
 src/common/slurm_protocol_defs.c              |  2 +-
 src/common/slurm_protocol_defs.h              |  2 +-
 src/common/slurm_protocol_interface.h         |  2 +-
 src/common/slurm_protocol_mongo_common.h      |  2 +-
 src/common/slurm_protocol_pack.c              |  2 +-
 src/common/slurm_protocol_pack.h              |  2 +-
 src/common/slurm_protocol_socket_common.h     |  2 +-
 .../slurm_protocol_socket_implementation.c    |  2 +-
 src/common/slurm_protocol_util.c              |  2 +-
 src/common/slurm_protocol_util.h              |  2 +-
 src/common/slurm_rlimits_info.c               |  2 +-
 src/common/slurm_rlimits_info.h               |  2 +-
 src/common/slurm_xlator.h                     |  2 +-
 src/common/switch.c                           |  2 +-
 src/common/switch.h                           |  2 +-
 src/common/uid.c                              |  2 +-
 src/common/uid.h                              |  2 +-
 src/common/unsetenv.c                         |  2 +-
 src/common/unsetenv.h                         |  2 +-
 src/common/util-net.c                         |  2 +-
 src/common/util-net.h                         |  2 +-
 src/common/xassert.c                          |  2 +-
 src/common/xassert.h                          |  2 +-
 src/common/xmalloc.c                          |  2 +-
 src/common/xmalloc.h                          |  2 +-
 src/common/xsignal.c                          |  2 +-
 src/common/xsignal.h                          |  2 +-
 src/common/xstring.c                          |  2 +-
 src/common/xstring.h                          |  2 +-
 src/plugins/auth/authd/auth_authd.c           |  2 +-
 src/plugins/auth/munge/auth_munge.c           |  2 +-
 src/plugins/auth/none/auth_none.c             |  2 +-
 src/plugins/checkpoint/aix/checkpoint_aix.c   |  2 +-
 src/plugins/checkpoint/none/checkpoint_none.c |  2 +-
 src/plugins/jobacct/aix/jobacct_aix.c         |  2 +-
 src/plugins/jobacct/common/common_slurmctld.c |  2 +-
 .../jobacct/common/common_slurmstepd.c        |  2 +-
 src/plugins/jobacct/common/jobacct_common.c   |  2 +-
 src/plugins/jobacct/common/jobacct_common.h   |  2 +-
 src/plugins/jobacct/linux/jobacct_linux.c     |  2 +-
 src/plugins/jobacct/none/jobacct_none.c       |  2 +-
 src/plugins/jobcomp/filetxt/jobcomp_filetxt.c |  2 +-
 src/plugins/jobcomp/none/jobcomp_none.c       |  2 +-
 src/plugins/jobcomp/script/job_record.c       |  2 +-
 src/plugins/jobcomp/script/job_record.h       |  2 +-
 src/plugins/jobcomp/script/jobcomp_script.c   |  2 +-
 src/plugins/mpi/lam/lam.h                     |  2 +-
 src/plugins/mpi/lam/mpi_lam.c                 |  2 +-
 src/plugins/mpi/mpichgm/mpi_mpichgm.c         |  2 +-
 src/plugins/mpi/mpichgm/mpichgm.c             |  2 +-
 src/plugins/mpi/mpichgm/mpichgm.h             |  2 +-
 src/plugins/mpi/mvapich/mpi_mvapich.c         |  2 +-
 src/plugins/mpi/mvapich/mvapich.c             |  2 +-
 src/plugins/mpi/mvapich/mvapich.h             |  2 +-
 src/plugins/mpi/none/mpi_none.c               |  2 +-
 src/plugins/proctrack/aix/proctrack_aix.c     |  2 +-
 src/plugins/proctrack/linuxproc/kill_tree.c   |  2 +-
 src/plugins/proctrack/linuxproc/kill_tree.h   |  2 +-
 .../proctrack/linuxproc/proctrack_linuxproc.c |  2 +-
 src/plugins/proctrack/pgid/proctrack_pgid.c   |  2 +-
 src/plugins/proctrack/rms/proctrack_rms.c     |  2 +-
 .../proctrack/sgi_job/proctrack_sgi_job.c     |  2 +-
 src/plugins/sched/backfill/backfill.c         |  2 +-
 src/plugins/sched/backfill/backfill.h         |  2 +-
 src/plugins/sched/backfill/backfill_wrapper.c |  2 +-
 src/plugins/sched/builtin/builtin_wrapper.c   |  2 +-
 src/plugins/sched/hold/hold_wrapper.c         |  2 +-
 src/plugins/sched/maui/agent.cpp              |  2 +-
 src/plugins/sched/maui/agent.h                |  2 +-
 src/plugins/sched/maui/comparator.h           |  2 +-
 src/plugins/sched/maui/condition.h            |  2 +-
 src/plugins/sched/maui/courier.cpp            |  2 +-
 src/plugins/sched/maui/courier.h              |  2 +-
 src/plugins/sched/maui/dstring.cpp            |  2 +-
 src/plugins/sched/maui/dstring.h              |  2 +-
 src/plugins/sched/maui/mailbag.h              |  2 +-
 src/plugins/sched/maui/message.h              |  2 +-
 src/plugins/sched/maui/prefix_courier.cpp     |  2 +-
 src/plugins/sched/maui/prefix_courier.h       |  2 +-
 src/plugins/sched/maui/receptionist.cpp       |  2 +-
 src/plugins/sched/maui/receptionist.h         |  2 +-
 .../sched/maui/wiki/wiki_canceljob.cpp        |  2 +-
 src/plugins/sched/maui/wiki/wiki_command.cpp  |  2 +-
 src/plugins/sched/maui/wiki/wiki_mailbag.cpp  |  2 +-
 src/plugins/sched/maui/wiki/wiki_mailbag.h    |  2 +-
 src/plugins/sched/maui/wiki/wiki_message.cpp  |  2 +-
 src/plugins/sched/maui/wiki/wiki_message.h    |  2 +-
 src/plugins/sched/maui/wiki/wiki_parser.cpp   |  2 +-
 src/plugins/sched/maui/wiki/wiki_parser.h     |  2 +-
 src/plugins/sched/maui/wiki/wiki_request.cpp  |  2 +-
 src/plugins/sched/maui/wiki/wiki_response.cpp |  2 +-
 src/plugins/sched/maui/wiki/wiki_startjob.cpp |  2 +-
 src/plugins/sched/maui/wiki/wiki_status.cpp   |  2 +-
 src/plugins/sched/maui/wiki/wiki_wrapper.cpp  |  2 +-
 src/plugins/sched/wiki2/cancel_job.c          |  2 +-
 src/plugins/sched/wiki2/crypto.c              |  2 +-
 src/plugins/sched/wiki2/get_jobs.c            |  2 +-
 src/plugins/sched/wiki2/get_nodes.c           |  2 +-
 src/plugins/sched/wiki2/job_add_task.c        |  2 +-
 src/plugins/sched/wiki2/job_release_task.c    |  2 +-
 src/plugins/sched/wiki2/msg.c                 |  2 +-
 src/plugins/sched/wiki2/msg.h                 |  2 +-
 src/plugins/sched/wiki2/resume_job.c          |  2 +-
 src/plugins/sched/wiki2/sched_wiki.c          |  2 +-
 src/plugins/sched/wiki2/start_job.c           |  2 +-
 src/plugins/sched/wiki2/suspend_job.c         |  2 +-
 .../block_allocator/block_allocator.c         |  2 +-
 .../block_allocator/block_allocator.h         |  2 +-
 .../bluegene/block_allocator/bridge_linker.c  |  2 +-
 .../bluegene/block_allocator/bridge_linker.h  |  2 +-
 .../select/bluegene/plugin/bg_block_info.c    |  2 +-
 .../select/bluegene/plugin/bg_block_info.h    |  2 +-
 .../select/bluegene/plugin/bg_job_place.c     |  2 +-
 .../select/bluegene/plugin/bg_job_place.h     |  2 +-
 .../select/bluegene/plugin/bg_job_run.c       |  2 +-
 .../select/bluegene/plugin/bg_job_run.h       |  2 +-
 .../bluegene/plugin/bg_switch_connections.c   |  2 +-
 .../select/bluegene/plugin/block_sys.c        |  2 +-
 src/plugins/select/bluegene/plugin/bluegene.c |  2 +-
 src/plugins/select/bluegene/plugin/bluegene.h |  2 +-
 src/plugins/select/bluegene/plugin/opts.c     |  2 +-
 .../select/bluegene/plugin/select_bluegene.c  |  2 +-
 src/plugins/select/bluegene/plugin/sfree.c    |  2 +-
 src/plugins/select/bluegene/plugin/sfree.h    |  2 +-
 .../select/bluegene/plugin/slurm_epilog.c     |  2 +-
 .../select/bluegene/plugin/slurm_prolog.c     |  2 +-
 .../select/bluegene/plugin/state_test.c       |  2 +-
 .../select/bluegene/plugin/state_test.h       |  2 +-
 src/plugins/select/cons_res/select_cons_res.c |  2 +-
 src/plugins/select/linear/select_linear.c     |  2 +-
 src/plugins/switch/elan/qsw.c                 |  2 +-
 src/plugins/switch/elan/qsw.h                 |  2 +-
 src/plugins/switch/elan/switch_elan.c         |  2 +-
 src/plugins/switch/federation/federation.c    |  2 +-
 src/plugins/switch/federation/federation.h    |  2 +-
 .../switch/federation/federation_keys.h       |  2 +-
 .../switch/federation/switch_federation.c     |  2 +-
 src/plugins/switch/none/switch_none.c         |  2 +-
 src/plugins/task/affinity/affinity.c          |  2 +-
 src/plugins/task/affinity/affinity.h          |  2 +-
 src/plugins/task/affinity/numa.c              |  2 +-
 src/plugins/task/affinity/schedutils.c        |  2 +-
 src/plugins/task/affinity/task_affinity.c     |  2 +-
 src/plugins/task/none/task_none.c             |  2 +-
 src/sacct/options.c                           |  2 +-
 src/sacct/print.c                             |  2 +-
 src/sacct/process.c                           |  2 +-
 src/sacct/sacct.c                             |  2 +-
 src/sacct/sacct.h                             |  2 +-
 src/sacct/sacct_stat.c                        |  2 +-
 src/sacct/sacct_stat.h                        |  2 +-
 src/sbcast/agent.c                            |  2 +-
 src/sbcast/opts.c                             |  2 +-
 src/sbcast/sbcast.c                           |  2 +-
 src/sbcast/sbcast.h                           |  2 +-
 src/scancel/opt.c                             |  2 +-
 src/scancel/scancel.c                         |  4 +--
 src/scancel/scancel.h                         |  2 +-
 src/scontrol/scontrol.c                       |  2 +-
 src/sinfo/opts.c                              |  2 +-
 src/sinfo/print.c                             |  2 +-
 src/sinfo/print.h                             |  2 +-
 src/sinfo/sinfo.c                             |  2 +-
 src/sinfo/sinfo.h                             |  2 +-
 src/sinfo/sort.c                              |  2 +-
 src/slurmctld/agent.c                         |  2 +-
 src/slurmctld/agent.h                         |  2 +-
 src/slurmctld/backup.c                        |  2 +-
 src/slurmctld/controller.c                    |  2 +-
 src/slurmctld/job_mgr.c                       |  2 +-
 src/slurmctld/job_scheduler.c                 |  2 +-
 src/slurmctld/locks.c                         |  2 +-
 src/slurmctld/locks.h                         |  2 +-
 src/slurmctld/node_mgr.c                      |  2 +-
 src/slurmctld/node_scheduler.c                |  2 +-
 src/slurmctld/node_scheduler.h                |  2 +-
 src/slurmctld/partition_mgr.c                 |  2 +-
 src/slurmctld/ping_nodes.c                    |  2 +-
 src/slurmctld/ping_nodes.h                    |  2 +-
 src/slurmctld/proc_req.c                      |  2 +-
 src/slurmctld/proc_req.h                      |  2 +-
 src/slurmctld/read_config.c                   |  2 +-
 src/slurmctld/read_config.h                   |  2 +-
 src/slurmctld/sched_plugin.c                  |  2 +-
 src/slurmctld/sched_plugin.h                  |  2 +-
 src/slurmctld/sched_upcalls.c                 |  2 +-
 src/slurmctld/slurmctld.h                     |  2 +-
 src/slurmctld/srun_comm.c                     |  2 +-
 src/slurmctld/srun_comm.h                     |  2 +-
 src/slurmctld/state_save.c                    |  2 +-
 src/slurmctld/state_save.h                    |  2 +-
 src/slurmctld/step_mgr.c                      |  2 +-
 src/slurmd/common/proctrack.c                 |  2 +-
 src/slurmd/common/proctrack.h                 |  2 +-
 src/slurmd/common/reverse_tree.h              |  2 +-
 src/slurmd/common/run_script.c                |  2 +-
 src/slurmd/common/run_script.h                |  2 +-
 src/slurmd/common/setproctitle.c              |  2 +-
 src/slurmd/common/setproctitle.h              |  2 +-
 src/slurmd/common/slurmstepd_init.c           |  2 +-
 src/slurmd/common/slurmstepd_init.h           |  2 +-
 src/slurmd/common/stepd_api.c                 |  2 +-
 src/slurmd/common/stepd_api.h                 |  2 +-
 src/slurmd/common/task_plugin.c               |  2 +-
 src/slurmd/common/task_plugin.h               |  2 +-
 src/slurmd/slurmd/get_mach_stat.c             |  2 +-
 src/slurmd/slurmd/get_mach_stat.h             |  2 +-
 src/slurmd/slurmd/read_proc.c                 |  2 +-
 src/slurmd/slurmd/req.c                       |  2 +-
 src/slurmd/slurmd/req.h                       |  2 +-
 src/slurmd/slurmd/reverse_tree_math.c         |  2 +-
 src/slurmd/slurmd/reverse_tree_math.h         |  2 +-
 src/slurmd/slurmd/slurmd.c                    |  2 +-
 src/slurmd/slurmd/slurmd.h                    |  2 +-
 src/slurmd/slurmd/xcpu.c                      |  2 +-
 src/slurmd/slurmd/xcpu.h                      |  2 +-
 src/slurmd/slurmstepd/fname.c                 |  2 +-
 src/slurmd/slurmstepd/fname.h                 |  2 +-
 src/slurmd/slurmstepd/io.c                    |  2 +-
 src/slurmd/slurmstepd/io.h                    |  2 +-
 src/slurmd/slurmstepd/mgr.c                   |  2 +-
 src/slurmd/slurmstepd/mgr.h                   |  2 +-
 src/slurmd/slurmstepd/pam_ses.c               |  2 +-
 src/slurmd/slurmstepd/pam_ses.h               |  2 +-
 src/slurmd/slurmstepd/pdebug.c                |  2 +-
 src/slurmd/slurmstepd/pdebug.h                |  2 +-
 src/slurmd/slurmstepd/req.c                   |  2 +-
 src/slurmd/slurmstepd/req.h                   |  2 +-
 src/slurmd/slurmstepd/slurmstepd.c            |  2 +-
 src/slurmd/slurmstepd/slurmstepd.h            |  2 +-
 src/slurmd/slurmstepd/slurmstepd_job.c        |  2 +-
 src/slurmd/slurmstepd/slurmstepd_job.h        |  2 +-
 src/slurmd/slurmstepd/task.c                  |  2 +-
 src/slurmd/slurmstepd/task.h                  |  2 +-
 src/slurmd/slurmstepd/task_exec.c             |  2 +-
 src/slurmd/slurmstepd/task_exec.h             |  2 +-
 src/slurmd/slurmstepd/ulimits.c               |  2 +-
 src/slurmd/slurmstepd/ulimits.h               |  2 +-
 src/smap/configure_functions.c                |  2 +-
 src/smap/grid_functions.c                     |  2 +-
 src/smap/job_functions.c                      |  2 +-
 src/smap/opts.c                               |  2 +-
 src/smap/partition_functions.c                |  2 +-
 src/smap/smap.c                               |  2 +-
 src/smap/smap.h                               |  2 +-
 src/squeue/opts.c                             |  2 +-
 src/squeue/print.c                            |  2 +-
 src/squeue/print.h                            |  2 +-
 src/squeue/sort.c                             |  2 +-
 src/squeue/squeue.c                           |  2 +-
 src/squeue/squeue.h                           |  2 +-
 src/srun/allocate.c                           |  2 +-
 src/srun/allocate.h                           |  2 +-
 src/srun/attach.c                             |  2 +-
 src/srun/core-format.c                        |  2 +-
 src/srun/core-format.h                        |  2 +-
 src/srun/fname.c                              |  2 +-
 src/srun/fname.h                              |  2 +-
 src/srun/launch.c                             |  2 +-
 src/srun/launch.h                             |  2 +-
 src/srun/msg.c                                |  2 +-
 src/srun/msg.h                                |  2 +-
 src/srun/multi_prog.c                         |  2 +-
 src/srun/multi_prog.h                         |  2 +-
 src/srun/opt.c                                |  2 +-
 src/srun/opt.h                                |  2 +-
 src/srun/reattach.c                           |  2 +-
 src/srun/reattach.h                           |  2 +-
 src/srun/signals.c                            |  2 +-
 src/srun/signals.h                            |  2 +-
 src/srun/sigstr.c                             |  2 +-
 src/srun/sigstr.h                             |  2 +-
 src/srun/srun.c                               |  2 +-
 src/srun/srun_job.c                           |  2 +-
 src/srun/srun_job.h                           |  2 +-
 testsuite/expect/README                       |  2 +-
 testsuite/expect/globals                      |  2 +-
 testsuite/expect/pkill                        |  2 +-
 testsuite/expect/regression                   |  2 +-
 testsuite/expect/regression.py                |  2 +-
 testsuite/expect/test1.1                      |  2 +-
 testsuite/expect/test1.10                     |  2 +-
 testsuite/expect/test1.11                     |  2 +-
 testsuite/expect/test1.12                     |  2 +-
 testsuite/expect/test1.13                     |  2 +-
 testsuite/expect/test1.14                     |  2 +-
 testsuite/expect/test1.15                     |  2 +-
 testsuite/expect/test1.16                     |  2 +-
 testsuite/expect/test1.17                     |  2 +-
 testsuite/expect/test1.18                     |  2 +-
 testsuite/expect/test1.18.prog.c              |  2 +-
 testsuite/expect/test1.19                     |  2 +-
 testsuite/expect/test1.2                      |  2 +-
 testsuite/expect/test1.20                     |  2 +-
 testsuite/expect/test1.21                     |  2 +-
 testsuite/expect/test1.22                     |  2 +-
 testsuite/expect/test1.23                     |  2 +-
 testsuite/expect/test1.24                     |  2 +-
 testsuite/expect/test1.25                     |  2 +-
 testsuite/expect/test1.26                     |  2 +-
 testsuite/expect/test1.27                     |  2 +-
 testsuite/expect/test1.28                     |  2 +-
 testsuite/expect/test1.29                     |  2 +-
 testsuite/expect/test1.29.prog.c              |  2 +-
 testsuite/expect/test1.3                      |  2 +-
 testsuite/expect/test1.30                     |  2 +-
 testsuite/expect/test1.31                     |  2 +-
 testsuite/expect/test1.32                     |  2 +-
 testsuite/expect/test1.32.prog.c              |  2 +-
 testsuite/expect/test1.33                     |  2 +-
 testsuite/expect/test1.34                     |  2 +-
 testsuite/expect/test1.35                     |  2 +-
 testsuite/expect/test1.36                     |  2 +-
 testsuite/expect/test1.37                     |  2 +-
 testsuite/expect/test1.38                     |  2 +-
 testsuite/expect/test1.39                     |  2 +-
 testsuite/expect/test1.39.prog.c              |  2 +-
 testsuite/expect/test1.4                      |  2 +-
 testsuite/expect/test1.40                     |  2 +-
 testsuite/expect/test1.41                     |  2 +-
 testsuite/expect/test1.42                     |  2 +-
 testsuite/expect/test1.43                     |  2 +-
 testsuite/expect/test1.44                     |  2 +-
 testsuite/expect/test1.45                     |  2 +-
 testsuite/expect/test1.46                     |  2 +-
 testsuite/expect/test1.47                     |  2 +-
 testsuite/expect/test1.48                     |  2 +-
 testsuite/expect/test1.49                     |  2 +-
 testsuite/expect/test1.5                      |  2 +-
 testsuite/expect/test1.50                     |  2 +-
 testsuite/expect/test1.51                     |  2 +-
 testsuite/expect/test1.52                     |  2 +-
 testsuite/expect/test1.53                     |  2 +-
 testsuite/expect/test1.54                     |  2 +-
 testsuite/expect/test1.55                     |  2 +-
 testsuite/expect/test1.56                     |  2 +-
 testsuite/expect/test1.6                      |  2 +-
 testsuite/expect/test1.7                      |  2 +-
 testsuite/expect/test1.8                      |  2 +-
 testsuite/expect/test1.80                     |  2 +-
 testsuite/expect/test1.81                     |  2 +-
 testsuite/expect/test1.82                     |  2 +-
 testsuite/expect/test1.83                     |  2 +-
 testsuite/expect/test1.84                     |  2 +-
 testsuite/expect/test1.85                     |  2 +-
 testsuite/expect/test1.86                     |  2 +-
 testsuite/expect/test1.87                     |  2 +-
 testsuite/expect/test1.88                     |  2 +-
 testsuite/expect/test1.88.prog.c              |  2 +-
 testsuite/expect/test1.89                     |  2 +-
 testsuite/expect/test1.89.prog.c              |  2 +-
 testsuite/expect/test1.9                      |  2 +-
 testsuite/expect/test1.90                     |  2 +-
 testsuite/expect/test1.90.prog.c              |  2 +-
 testsuite/expect/test10.1                     |  2 +-
 testsuite/expect/test10.10                    |  2 +-
 testsuite/expect/test10.11                    |  2 +-
 testsuite/expect/test10.12                    |  2 +-
 testsuite/expect/test10.13                    |  2 +-
 testsuite/expect/test10.2                     |  2 +-
 testsuite/expect/test10.3                     |  2 +-
 testsuite/expect/test10.4                     |  2 +-
 testsuite/expect/test10.5                     |  2 +-
 testsuite/expect/test10.6                     |  2 +-
 testsuite/expect/test10.7                     |  2 +-
 testsuite/expect/test10.8                     |  2 +-
 testsuite/expect/test10.9                     |  2 +-
 testsuite/expect/test11.1                     |  2 +-
 testsuite/expect/test11.2                     |  2 +-
 testsuite/expect/test11.3                     |  2 +-
 testsuite/expect/test11.4                     |  2 +-
 testsuite/expect/test11.5                     |  2 +-
 testsuite/expect/test11.7                     |  2 +-
 testsuite/expect/test12.1                     |  2 +-
 testsuite/expect/test12.2                     |  2 +-
 testsuite/expect/test12.2.prog.c              |  2 +-
 testsuite/expect/test13.1                     |  2 +-
 testsuite/expect/test14.1                     |  2 +-
 testsuite/expect/test14.2                     |  2 +-
 testsuite/expect/test14.3                     |  2 +-
 testsuite/expect/test14.4                     |  2 +-
 testsuite/expect/test14.5                     |  2 +-
 testsuite/expect/test14.6                     |  2 +-
 testsuite/expect/test14.7                     |  2 +-
 testsuite/expect/test14.8                     |  2 +-
 testsuite/expect/test2.1                      |  2 +-
 testsuite/expect/test2.10                     |  2 +-
 testsuite/expect/test2.2                      |  2 +-
 testsuite/expect/test2.3                      |  2 +-
 testsuite/expect/test2.4                      |  2 +-
 testsuite/expect/test2.5                      |  2 +-
 testsuite/expect/test2.6                      |  2 +-
 testsuite/expect/test2.7                      |  2 +-
 testsuite/expect/test2.8                      |  2 +-
 testsuite/expect/test2.9                      |  2 +-
 testsuite/expect/test3.1                      |  2 +-
 testsuite/expect/test3.2                      |  2 +-
 testsuite/expect/test3.3                      |  2 +-
 testsuite/expect/test3.4                      |  2 +-
 testsuite/expect/test3.5                      |  2 +-
 testsuite/expect/test3.6                      |  2 +-
 testsuite/expect/test3.7                      |  2 +-
 testsuite/expect/test3.7.prog.c               |  2 +-
 testsuite/expect/test4.1                      |  2 +-
 testsuite/expect/test4.10                     |  2 +-
 testsuite/expect/test4.11                     |  2 +-
 testsuite/expect/test4.2                      |  2 +-
 testsuite/expect/test4.3                      |  2 +-
 testsuite/expect/test4.4                      |  2 +-
 testsuite/expect/test4.5                      |  2 +-
 testsuite/expect/test4.6                      |  2 +-
 testsuite/expect/test4.7                      |  2 +-
 testsuite/expect/test4.8                      |  2 +-
 testsuite/expect/test4.9                      |  2 +-
 testsuite/expect/test5.1                      |  2 +-
 testsuite/expect/test5.2                      |  2 +-
 testsuite/expect/test5.3                      |  2 +-
 testsuite/expect/test5.4                      |  2 +-
 testsuite/expect/test5.5                      |  2 +-
 testsuite/expect/test5.6                      |  2 +-
 testsuite/expect/test5.7                      |  2 +-
 testsuite/expect/test5.8                      |  2 +-
 testsuite/expect/test6.1                      |  2 +-
 testsuite/expect/test6.10                     |  2 +-
 testsuite/expect/test6.11                     |  2 +-
 testsuite/expect/test6.12                     |  2 +-
 testsuite/expect/test6.2                      |  2 +-
 testsuite/expect/test6.3                      |  2 +-
 testsuite/expect/test6.4                      |  2 +-
 testsuite/expect/test6.5                      |  2 +-
 testsuite/expect/test6.6                      |  2 +-
 testsuite/expect/test6.7                      |  2 +-
 testsuite/expect/test6.8                      |  2 +-
 testsuite/expect/test6.9                      |  2 +-
 testsuite/expect/test7.1                      |  2 +-
 testsuite/expect/test7.2                      |  2 +-
 testsuite/expect/test7.2.prog.c               |  2 +-
 testsuite/expect/test7.3                      |  2 +-
 testsuite/expect/test7.3.io.c                 |  2 +-
 testsuite/expect/test7.3.prog.c               |  2 +-
 testsuite/expect/test7.4                      |  2 +-
 testsuite/expect/test7.4.prog.c               |  2 +-
 testsuite/expect/test8.1                      |  2 +-
 testsuite/expect/test8.2                      |  2 +-
 testsuite/expect/test8.3                      |  2 +-
 testsuite/expect/test8.4                      |  2 +-
 testsuite/expect/test8.4.prog.c               |  2 +-
 testsuite/expect/test9.1                      |  2 +-
 testsuite/expect/test9.2                      |  2 +-
 testsuite/expect/test9.3                      |  2 +-
 testsuite/expect/test9.4                      |  2 +-
 testsuite/expect/test9.5                      |  2 +-
 testsuite/expect/test9.6                      |  2 +-
 testsuite/expect/test9.7                      |  2 +-
 testsuite/expect/test9.7.bash                 |  2 +-
 testsuite/expect/test9.8                      |  2 +-
 testsuite/expect/usleep                       |  2 +-
 .../slurm_unit/api/manual/allocate-tst.c      |  2 +-
 testsuite/slurm_unit/api/manual/cancel-tst.c  |  2 +-
 .../slurm_unit/api/manual/complete-tst.c      |  2 +-
 .../slurm_unit/api/manual/job_info-tst.c      |  2 +-
 .../slurm_unit/api/manual/node_info-tst.c     |  2 +-
 .../api/manual/partition_info-tst.c           |  2 +-
 .../slurm_unit/api/manual/reconfigure-tst.c   |  2 +-
 testsuite/slurm_unit/api/manual/submit-tst.c  |  2 +-
 .../slurm_unit/api/manual/update_config-tst.c |  2 +-
 570 files changed, 629 insertions(+), 584 deletions(-)
 create mode 100644 doc/man/man8/slurmstepd.8

diff --git a/COPYING b/COPYING
index 77086c39aec..4938ad93383 100644
--- a/COPYING
+++ b/COPYING
@@ -44,7 +44,7 @@ purposes.
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -347,7 +347,7 @@ the "copyright" line and a pointer to where the full notice is found.
 
     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
 
 
 Also add information on how to contact you by electronic and paper mail.
diff --git a/DISCLAIMER b/DISCLAIMER
index d350d94a195..47cf0c61a2e 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -44,7 +44,7 @@ details.
 
 You should have received a copy of the GNU General Public License along
 with SLURM; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 
 
 OUR NOTICE AND TERMS OF AND CONDITIONS OF THE GNU GENERAL PUBLIC LICENSE
diff --git a/NEWS b/NEWS
index 6a4536a268f..c41da4794e6 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,9 @@ documents those changes that are of interest to users and admins.
 =========================
  - Update file headers adding permission to link with OpenSSL.
  - Enable sched/wiki2 message authentication.
+ - Fix libpmi compilation issue.
+ - Remove "gcc-c++ python" from slurm.spec BuildRequires.  It breaks
+   the AIX build, so we'll have to find another way to deal with that.
 
 * Changes in SLURM 1.1.10
 =========================
@@ -297,6 +300,13 @@ documents those changes that are of interest to users and admins.
  -- Remove some use of cr_enabled flag in slurmctld job record, use 
     new flag "test_only" in select_g_job_test() instead.
 
+* Changes in SLURM 1.0.16
+=========================
+ -- For "srun --attach=X" to other users job, report an error and exit (it
+    previously just hung).
+ -- Make sure that "scancel -s KILL" terminates the job just like "scancel" 
+    including deletion of all job steps (Chris Holmes, HP, slurm,patch).
+
 * Changes in SLURM 1.0.15
 =========================
  -- In srun, reset stdin to blocking mode (if it was originally blocking before
diff --git a/doc/html/configurator.html b/doc/html/configurator.html
index 2654e9e596e..31b7a8f54ba 100644
--- a/doc/html/configurator.html
+++ b/doc/html/configurator.html
@@ -19,7 +19,7 @@ details.
 
 You should have received a copy of the GNU General Public License along
 with SLURM; if not, write to the Free Software Foundation, Inc.,
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 
 $Id$
 -->
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
index a9c8ddf963f..f431be42c9f 100644
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -12,7 +12,8 @@ man1_MANS =            \
 	man1/slurm.1 \
 	man1/smap.1 \
 	man1/squeue.1 \
-	man1/srun.1
+	man1/srun.1 \
+	man1/sbcast.1   
 
 man3_MANS = man3/slurm_hostlist_create.3 \
 	man3/slurm_hostlist_destroy.3 \
@@ -90,7 +91,8 @@ man5_MANS = man5/bluegene.conf.5 \
 
 man8_MANS = man8/slurmctld.8 \
 	man8/slurmd.8 \
-	man8/spank.8
+	man8/spank.8 \
+	man8/slurmstepd.8
 
 dist-hook:
 	-rm -rf `find $(distdir) -name CVS`
diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
index 41ef59610c1..c3d4bc9f1c1 100644
--- a/doc/man/Makefile.in
+++ b/doc/man/Makefile.in
@@ -264,7 +264,8 @@ man1_MANS = \
 	man1/slurm.1 \
 	man1/smap.1 \
 	man1/squeue.1 \
-	man1/srun.1
+	man1/srun.1 \
+	man1/sbcast.1   
 
 man3_MANS = man3/slurm_hostlist_create.3 \
 	man3/slurm_hostlist_destroy.3 \
@@ -342,7 +343,8 @@ man5_MANS = man5/bluegene.conf.5 \
 
 man8_MANS = man8/slurmctld.8 \
 	man8/slurmd.8 \
-	man8/spank.8
+	man8/spank.8 \
+	man8/slurmstepd.8
 
 all: all-am
 
diff --git a/doc/man/man8/slurmstepd.8 b/doc/man/man8/slurmstepd.8
new file mode 100644
index 00000000000..da86462de82
--- /dev/null
+++ b/doc/man/man8/slurmstepd.8
@@ -0,0 +1,31 @@
+.TH SLURMSTEPD "8" "September 2006" "slurmstepd 1.1" "Slurm components"
+.SH "NAME"
+slurmstepd \- The job step manager for SLURM.
+.SH "SYNOPSIS"
+\fBslurmstepd\fR
+.SH "DESCRIPTION"
+\fBslurmstepd\fR is a job step manager for SLURM. 
+It is spawned by the \fBslurmd\fR daemon when a job step is launched 
+and terminates when the job step does. 
+It is responsible for managing input and output (stdin, stdout and stderr)
+for the job step along with its accounting and signal processing. 
+\fBslurmstepd\fR should not be initiated by users or system administrators.
+.SH "COPYING"
+Copyright (C) 2006 The Regents of the University of California.
+Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+UCRL-CODE-217948.
+.LP
+This file is part of SLURM, a resource management program.
+For details, see <http://www.llnl.gov/linux/slurm/>.
+.LP
+SLURM is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2 of the License, or (at your option)
+any later version.
+.LP
+SLURM 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.
+.SH "SEE ALSO"
+\fBslurmd\fR(8)
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index b24d2125cc0..d2f641c689f 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_H
diff --git a/slurm/slurm_errno.h b/slurm/slurm_errno.h
index db3b397bf49..8aa54df3380 100644
--- a/slurm/slurm_errno.h
+++ b/slurm/slurm_errno.h
@@ -33,7 +33,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _SLURM_ERRNO_H
 #define _SLURM_ERRNO_H
diff --git a/slurm/spank.h b/slurm/spank.h
index 47936476274..d31fb6bb3bb 100644
--- a/slurm/spank.h
+++ b/slurm/spank.h
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef SPANK_H
 #define SPANK_H
diff --git a/src/api/Makefile.am b/src/api/Makefile.am
index 5bbe193a15f..c1c8a501d6c 100644
--- a/src/api/Makefile.am
+++ b/src/api/Makefile.am
@@ -99,7 +99,7 @@ libslurmhelper_la_LDFLAGs = \
 	$(LIB_LDFLAGS) \
 	-version-info $(current):$(rev):$(age)
 
-libpmi_la_LBFLAGS = $(LIB_LDFLAGS)
+libpmi_la_LDFLAGS = $(LIB_LDFLAGS)
 
 force:
 $(libslurm_la_LIBADD) : force
diff --git a/src/api/Makefile.in b/src/api/Makefile.in
index eba74b688ae..50506b8355e 100644
--- a/src/api/Makefile.in
+++ b/src/api/Makefile.in
@@ -382,7 +382,7 @@ libslurmhelper_la_LDFLAGs = \
 	$(LIB_LDFLAGS) \
 	-version-info $(current):$(rev):$(age)
 
-libpmi_la_LBFLAGS = $(LIB_LDFLAGS)
+libpmi_la_LDFLAGS = $(LIB_LDFLAGS)
 CLEANFILES = \
 	$(VERSION_SCRIPT)
 
diff --git a/src/api/allocate.c b/src/api/allocate.c
index b706fac32d4..7a103a9dec8 100644
--- a/src/api/allocate.c
+++ b/src/api/allocate.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/cancel.c b/src/api/cancel.c
index 74faf692486..bc3ca000cb5 100644
--- a/src/api/cancel.c
+++ b/src/api/cancel.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/checkpoint.c b/src/api/checkpoint.c
index 043ed3f9433..801e056ccbd 100644
--- a/src/api/checkpoint.c
+++ b/src/api/checkpoint.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/complete.c b/src/api/complete.c
index a162ee25443..e17abcaaab7 100644
--- a/src/api/complete.c
+++ b/src/api/complete.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/config_info.c b/src/api/config_info.c
index 6fe8236b766..fa11f58c68a 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/init_msg.c b/src/api/init_msg.c
index 046e6166249..fc1e247b18d 100644
--- a/src/api/init_msg.c
+++ b/src/api/init_msg.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/job_info.c b/src/api/job_info.c
index d5407933e6a..344fa53c7f9 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -15,17 +15,17 @@
  *  Software Foundation; either version 2 of the License, or (at your option)
  *  any later version.
  *
- *  In addition, as a special exception, the copyright holders give permission
- *  to link the code of portions of this program with the OpenSSL library under
- *  certain conditions as described in each individual source file, and
- *  distribute linked combinations including the two. You must obey the GNU
- *  General Public License in all respects for all of the code used other than
- *  OpenSSL. If you modify file(s) with this exception, you may extend this
- *  exception to your version of the file(s), but you are not obligated to do
+ *  In addition, as a special exception, the copyright holders give permission 
+ *  to link the code of portions of this program with the OpenSSL library under 
+ *  certain conditions as described in each individual source file, and 
+ *  distribute linked combinations including the two. You must obey the GNU 
+ *  General Public License in all respects for all of the code used other than 
+ *  OpenSSL. If you modify file(s) with this exception, you may extend this 
+ *  exception to your version of the file(s), but you are not obligated to do 
  *  so. If you do not wish to do so, delete this exception statement from your
- *  version.  If you delete this exception statement from all source files in
+ *  version.  If you delete this exception statement from all source files in 
  *  the program, then also delete it here.
- *
+ *  
  *  SLURM 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
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/job_info.h b/src/api/job_info.h
index 465f86a9769..7cb1142fa0f 100644
--- a/src/api/job_info.h
+++ b/src/api/job_info.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _JOB_INFO_H
diff --git a/src/api/job_step_info.c b/src/api/job_step_info.c
index ad0aa9691e8..d34b84d293b 100644
--- a/src/api/job_step_info.c
+++ b/src/api/job_step_info.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/node_info.c b/src/api/node_info.c
index bdd900e75df..5baf652da09 100644
--- a/src/api/node_info.c
+++ b/src/api/node_info.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/node_select_info.c b/src/api/node_select_info.c
index f0cf3e37558..8d21a51c3f5 100644
--- a/src/api/node_select_info.c
+++ b/src/api/node_select_info.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/node_select_info.h b/src/api/node_select_info.h
index 8e887b40546..01b47f481ab 100644
--- a/src/api/node_select_info.h
+++ b/src/api/node_select_info.h
@@ -38,7 +38,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _NODE_SELECT_INFO_H
diff --git a/src/api/partition_info.c b/src/api/partition_info.c
index b76b3f5422e..efd32aa6dd0 100644
--- a/src/api/partition_info.c
+++ b/src/api/partition_info.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/pmi.c b/src/api/pmi.c
index 798412849d1..afec20612e9 100644
--- a/src/api/pmi.c
+++ b/src/api/pmi.c
@@ -77,7 +77,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #define _GNU_SOURCE
 
diff --git a/src/api/reconfigure.c b/src/api/reconfigure.c
index e180b7f69a6..dddfec06ce5 100644
--- a/src/api/reconfigure.c
+++ b/src/api/reconfigure.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/signal.c b/src/api/signal.c
index 17bfe8a8a1e..3b63a35cecb 100644
--- a/src/api/signal.c
+++ b/src/api/signal.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/slurm_pmi.c b/src/api/slurm_pmi.c
index 9cbe4c7f381..8ec309f6cb7 100644
--- a/src/api/slurm_pmi.c
+++ b/src/api/slurm_pmi.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdlib.h>
diff --git a/src/api/slurm_pmi.h b/src/api/slurm_pmi.h
index 3a1783210bb..f7dc95aaab2 100644
--- a/src/api/slurm_pmi.h
+++ b/src/api/slurm_pmi.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PMI_H
diff --git a/src/api/spawn.c b/src/api/spawn.c
index 023cbacfce8..8c235534d94 100644
--- a/src/api/spawn.c
+++ b/src/api/spawn.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/submit.c b/src/api/submit.c
index cddb8685974..bfa77c94237 100644
--- a/src/api/submit.c
+++ b/src/api/submit.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/suspend.c b/src/api/suspend.c
index 119ec929b57..4b24dbdb6f7 100644
--- a/src/api/suspend.c
+++ b/src/api/suspend.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/api/update_config.c b/src/api/update_config.c
index d05584ad93a..89116adbe7e 100644
--- a/src/api/update_config.c
+++ b/src/api/update_config.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/arg_desc.c b/src/common/arg_desc.c
index 12472b01ad3..f97ed799c1b 100644
--- a/src/common/arg_desc.c
+++ b/src/common/arg_desc.c
@@ -31,7 +31,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 #include <string.h>
 #include "src/common/arg_desc.h"
diff --git a/src/common/arg_desc.h b/src/common/arg_desc.h
index 7383ac8435e..36c5637d35c 100644
--- a/src/common/arg_desc.h
+++ b/src/common/arg_desc.h
@@ -31,7 +31,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 #ifndef __ARG_DESC_H__
 #define __ARG_DESC_H__
diff --git a/src/common/bitstring.c b/src/common/bitstring.c
index 880edfb310e..890235dcc91 100644
--- a/src/common/bitstring.c
+++ b/src/common/bitstring.c
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <assert.h>
diff --git a/src/common/bitstring.h b/src/common/bitstring.h
index 8bdb7a4d75e..2427234ef3c 100644
--- a/src/common/bitstring.h
+++ b/src/common/bitstring.h
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*
diff --git a/src/common/cbuf.c b/src/common/cbuf.c
index f2c2676e376..1f2744c1049 100644
--- a/src/common/cbuf.c
+++ b/src/common/cbuf.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with LSD-Tools; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************
  *  Refer to "cbuf.h" for documentation on public functions.
  *****************************************************************************/
diff --git a/src/common/cbuf.h b/src/common/cbuf.h
index a3516f05bcd..bd7cd1843d2 100644
--- a/src/common/cbuf.h
+++ b/src/common/cbuf.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with LSD-Tools; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************/
 
 
diff --git a/src/common/checkpoint.c b/src/common/checkpoint.c
index 34200db8e7c..87a75447c43 100644
--- a/src/common/checkpoint.c
+++ b/src/common/checkpoint.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/common/checkpoint.h b/src/common/checkpoint.h
index 75e3d6178b8..7439ee76bfb 100644
--- a/src/common/checkpoint.h
+++ b/src/common/checkpoint.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __CHECKPOINT_H__
diff --git a/src/common/daemonize.c b/src/common/daemonize.c
index 528f8bd1fd3..a17f1985690 100644
--- a/src/common/daemonize.c
+++ b/src/common/daemonize.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/daemonize.h b/src/common/daemonize.h
index e6d8243d35e..5c4aa6f0358 100644
--- a/src/common/daemonize.h
+++ b/src/common/daemonize.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/common/eio.c b/src/common/eio.c
index fb0e2487ed7..998f8c0f9cd 100644
--- a/src/common/eio.c
+++ b/src/common/eio.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #  include <config.h>
diff --git a/src/common/eio.h b/src/common/eio.h
index b834cdfb864..95f31acf4d7 100644
--- a/src/common/eio.h
+++ b/src/common/eio.h
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _EIO_H
diff --git a/src/common/env.c b/src/common/env.c
index b6cdaf4831e..ded9a70f4eb 100644
--- a/src/common/env.c
+++ b/src/common/env.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/env.h b/src/common/env.h
index ab03b2d94fb..0ca1bfff743 100644
--- a/src/common/env.h
+++ b/src/common/env.h
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _ENV_H
 #define _ENV_H
diff --git a/src/common/fd.c b/src/common/fd.c
index c44734123ab..6c935ba45c1 100644
--- a/src/common/fd.c
+++ b/src/common/fd.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with ConMan; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************
  *  Refer to "fd.h" for documentation on public functions.
 \*****************************************************************************/
diff --git a/src/common/fd.h b/src/common/fd.h
index efe68efc65a..cd450b3f655 100644
--- a/src/common/fd.h
+++ b/src/common/fd.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with ConMan; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/common/forward.c b/src/common/forward.c
index cd3736c7e8b..a93e7cbb796 100644
--- a/src/common/forward.c
+++ b/src/common/forward.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/forward.h b/src/common/forward.h
index 059619e675b..eab25741f1d 100644
--- a/src/common/forward.h
+++ b/src/common/forward.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _FORWARD_H
diff --git a/src/common/getopt.c b/src/common/getopt.c
index 942fede61d0..8a2f95b77aa 100644
--- a/src/common/getopt.c
+++ b/src/common/getopt.c
@@ -18,8 +18,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
 
 /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
    Ditto for AIX 3.2 and <stdlib.h>.  */
diff --git a/src/common/getopt.h b/src/common/getopt.h
index a1b8dd6658f..d0694bd3ee5 100644
--- a/src/common/getopt.h
+++ b/src/common/getopt.h
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
 
 #ifndef _GETOPT_H
 
diff --git a/src/common/getopt1.c b/src/common/getopt1.c
index 22a7efbdd19..53aabec5948 100644
--- a/src/common/getopt1.c
+++ b/src/common/getopt1.c
@@ -15,8 +15,8 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301 USA.  */
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/common/global_srun.c b/src/common/global_srun.c
index 3ad00713b6e..cba0409a2ea 100644
--- a/src/common/global_srun.c
+++ b/src/common/global_srun.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/global_srun.h b/src/common/global_srun.h
index ea904b9c67d..89bb7667b9d 100644
--- a/src/common/global_srun.h
+++ b/src/common/global_srun.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _GLOBAL_SRUN_H
diff --git a/src/common/hostlist.c b/src/common/hostlist.c
index 6fcaaca1ecf..a229c292f84 100644
--- a/src/common/hostlist.c
+++ b/src/common/hostlist.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/hostlist.h b/src/common/hostlist.h
index 734609eb75a..c832fea81e2 100644
--- a/src/common/hostlist.h
+++ b/src/common/hostlist.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HOSTLIST_H
diff --git a/src/common/io_hdr.c b/src/common/io_hdr.c
index d05f6dfaf99..54dbc5c0fe4 100644
--- a/src/common/io_hdr.c
+++ b/src/common/io_hdr.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/io_hdr.h b/src/common/io_hdr.h
index 2da1e5e1edd..e8c38659527 100644
--- a/src/common/io_hdr.h
+++ b/src/common/io_hdr.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_IO_HDR_H
diff --git a/src/common/job_options.c b/src/common/job_options.c
index fc80568e60b..4b86747256d 100644
--- a/src/common/job_options.c
+++ b/src/common/job_options.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/job_options.h b/src/common/job_options.h
index 5ead111d0b7..9cdfba3fafc 100644
--- a/src/common/job_options.h
+++ b/src/common/job_options.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _JOB_OPTIONS_H
diff --git a/src/common/list.c b/src/common/list.c
index 86a2fbca784..93d686b3c15 100644
--- a/src/common/list.c
+++ b/src/common/list.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with LSD-Tools; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************
  *  Refer to "list.h" for documentation on public functions.
  *****************************************************************************/
diff --git a/src/common/list.h b/src/common/list.h
index 95c75904531..d9efbd693e6 100644
--- a/src/common/list.h
+++ b/src/common/list.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with LSD-Tools; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************/
 
 
diff --git a/src/common/macros.h b/src/common/macros.h
index 712da09708a..5650ab9087f 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _MACROS_H
diff --git a/src/common/mpi.c b/src/common/mpi.c
index ee48365cd9c..554f45ed8bd 100644
--- a/src/common/mpi.c
+++ b/src/common/mpi.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/mpi.h b/src/common/mpi.h
index 8ec0d9f672f..854170baa03 100644
--- a/src/common/mpi.h
+++ b/src/common/mpi.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SRUN_MPI_H
diff --git a/src/common/net.c b/src/common/net.c
index a113d5ba946..f0ae7a0d57a 100644
--- a/src/common/net.c
+++ b/src/common/net.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/common/net.h b/src/common/net.h
index 145aca9385c..3cfad15fff8 100644
--- a/src/common/net.h
+++ b/src/common/net.h
@@ -33,7 +33,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _NET_H
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 538f7fb27e4..f344db573b4 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -42,7 +42,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/node_select.h b/src/common/node_select.h
index 62d231118c5..f0fa94998f3 100644
--- a/src/common/node_select.h
+++ b/src/common/node_select.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _NODE_SELECT_H 
diff --git a/src/common/optz.c b/src/common/optz.c
index e0fa8a4b9d6..6af61778961 100644
--- a/src/common/optz.c
+++ b/src/common/optz.c
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/optz.h b/src/common/optz.h
index d23a19c1a0f..bb16a7558ae 100644
--- a/src/common/optz.h
+++ b/src/common/optz.h
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _OPTZ_H
diff --git a/src/common/pack.c b/src/common/pack.c
index 90a6ab10665..d55ca93b3b9 100644
--- a/src/common/pack.c
+++ b/src/common/pack.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/pack.h b/src/common/pack.h
index 1473bc85e0e..ce9185d0610 100644
--- a/src/common/pack.h
+++ b/src/common/pack.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 
 #ifndef _PACK_INCLUDED
diff --git a/src/common/parse_config.c b/src/common/parse_config.c
index cd7027610b4..e8ac783dc51 100644
--- a/src/common/parse_config.c
+++ b/src/common/parse_config.c
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/parse_config.h b/src/common/parse_config.h
index 807a75fbdd0..bfc3221cf25 100644
--- a/src/common/parse_config.h
+++ b/src/common/parse_config.h
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _PARSE_CONFIG_H
diff --git a/src/common/parse_spec.c b/src/common/parse_spec.c
index 55ba82b70d2..d6b96c2dc48 100644
--- a/src/common/parse_spec.c
+++ b/src/common/parse_spec.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/parse_spec.h b/src/common/parse_spec.h
index 6283539fbb9..002c2cd8eec 100644
--- a/src/common/parse_spec.h
+++ b/src/common/parse_spec.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PARSE_H_
diff --git a/src/common/parse_time.c b/src/common/parse_time.c
index c668e35d9f6..6d70566fcaf 100644
--- a/src/common/parse_time.c
+++ b/src/common/parse_time.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/common/parse_time.h b/src/common/parse_time.h
index 598be5fc039..123228a4abd 100644
--- a/src/common/parse_time.h
+++ b/src/common/parse_time.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _PARSE_TIME_H_
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 2408eb7fa81..19409865377 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/plugin.h b/src/common/plugin.h
index fc84701a09c..508ec7e5997 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __GENERIC_PLUGIN_H__
diff --git a/src/common/plugrack.c b/src/common/plugrack.c
index 3d95cb4a9b8..493d126efd2 100644
--- a/src/common/plugrack.c
+++ b/src/common/plugrack.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/plugrack.h b/src/common/plugrack.h
index 019082fce2d..516e60278e6 100644
--- a/src/common/plugrack.h
+++ b/src/common/plugrack.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __PLUGRACK_H__
diff --git a/src/common/plugstack.c b/src/common/plugstack.c
index 9abdc3877f7..536df262ac5 100644
--- a/src/common/plugstack.c
+++ b/src/common/plugstack.c
@@ -31,7 +31,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/plugstack.h b/src/common/plugstack.h
index 1950ad2ea59..9c5bc9441e3 100644
--- a/src/common/plugstack.h
+++ b/src/common/plugstack.h
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _PLUGSTACK_H
diff --git a/src/common/read_config.c b/src/common/read_config.c
index b89e441b211..d3dd08dd3bf 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/read_config.h b/src/common/read_config.h
index c276362baa3..6709f5d1bdf 100644
--- a/src/common/read_config.h
+++ b/src/common/read_config.h
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _READ_CONFIG_H
diff --git a/src/common/safeopen.c b/src/common/safeopen.c
index eb3123160d8..ab79f68f6cf 100644
--- a/src/common/safeopen.c
+++ b/src/common/safeopen.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/common/safeopen.h b/src/common/safeopen.h
index a82f8af2d3f..83ffc49f1e6 100644
--- a/src/common/safeopen.h
+++ b/src/common/safeopen.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SAFEOPEN_H
diff --git a/src/common/slurm_auth.c b/src/common/slurm_auth.c
index 74da89a6173..c2bde36c06b 100644
--- a/src/common/slurm_auth.c
+++ b/src/common/slurm_auth.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdlib.h>
diff --git a/src/common/slurm_auth.h b/src/common/slurm_auth.h
index dcdaf88134b..d4d7ecd4271 100644
--- a/src/common/slurm_auth.h
+++ b/src/common/slurm_auth.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_AUTHENTICATION_H__
diff --git a/src/common/slurm_cred.c b/src/common/slurm_cred.c
index f96a01e45ff..daa411a183e 100644
--- a/src/common/slurm_cred.c
+++ b/src/common/slurm_cred.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/common/slurm_cred.h b/src/common/slurm_cred.h
index daa962fa13e..85e5d028b75 100644
--- a/src/common/slurm_cred.h
+++ b/src/common/slurm_cred.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_SLURM_CRED_H
diff --git a/src/common/slurm_errno.c b/src/common/slurm_errno.c
index 064ebbb34d9..6f4345d442c 100644
--- a/src/common/slurm_errno.c
+++ b/src/common/slurm_errno.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*  This implementation relies on "overloading" the libc errno by 
diff --git a/src/common/slurm_jobacct.c b/src/common/slurm_jobacct.c
index 9f81371137c..e502b286bc7 100644
--- a/src/common/slurm_jobacct.c
+++ b/src/common/slurm_jobacct.c
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*****************************************************************************\
diff --git a/src/common/slurm_jobacct.h b/src/common/slurm_jobacct.h
index aff45a8d399..aee570c0943 100644
--- a/src/common/slurm_jobacct.h
+++ b/src/common/slurm_jobacct.h
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*****************************************************************************\
diff --git a/src/common/slurm_jobcomp.c b/src/common/slurm_jobcomp.c
index 0231b4c0a4d..85f04808de1 100644
--- a/src/common/slurm_jobcomp.c
+++ b/src/common/slurm_jobcomp.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/slurm_jobcomp.h b/src/common/slurm_jobcomp.h
index 35f540d27bd..9960538c0d1 100644
--- a/src/common/slurm_jobcomp.h
+++ b/src/common/slurm_jobcomp.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_JOBCOMP_H__
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index d2584506ba3..2f7178ac0b2 100644
--- a/src/common/slurm_protocol_api.c
+++ b/src/common/slurm_protocol_api.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index 7ff5a03d17d..a3b8e0d381e 100644
--- a/src/common/slurm_protocol_api.h
+++ b/src/common/slurm_protocol_api.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_API_H
diff --git a/src/common/slurm_protocol_common.h b/src/common/slurm_protocol_common.h
index d03a6e3d6a1..accebe22c9e 100644
--- a/src/common/slurm_protocol_common.h
+++ b/src/common/slurm_protocol_common.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_COMMON_H
diff --git a/src/common/slurm_protocol_defs.c b/src/common/slurm_protocol_defs.c
index d9114b917e7..5e4aef6ae4c 100644
--- a/src/common/slurm_protocol_defs.c
+++ b/src/common/slurm_protocol_defs.c
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index a422bfbda78..f5a664b2a16 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_DEFS_H
diff --git a/src/common/slurm_protocol_interface.h b/src/common/slurm_protocol_interface.h
index 159091b3b54..13fb9f66611 100644
--- a/src/common/slurm_protocol_interface.h
+++ b/src/common/slurm_protocol_interface.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_INTERFACE_H
diff --git a/src/common/slurm_protocol_mongo_common.h b/src/common/slurm_protocol_mongo_common.h
index fe1daf913a3..98997ef6bb2 100644
--- a/src/common/slurm_protocol_mongo_common.h
+++ b/src/common/slurm_protocol_mongo_common.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_MONGO_COMMON_H
diff --git a/src/common/slurm_protocol_pack.c b/src/common/slurm_protocol_pack.c
index 6b657c2f63b..2be34c09083 100644
--- a/src/common/slurm_protocol_pack.c
+++ b/src/common/slurm_protocol_pack.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/slurm_protocol_pack.h b/src/common/slurm_protocol_pack.h
index 7a59511a2db..162684e1b87 100644
--- a/src/common/slurm_protocol_pack.h
+++ b/src/common/slurm_protocol_pack.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_PACK_H
diff --git a/src/common/slurm_protocol_socket_common.h b/src/common/slurm_protocol_socket_common.h
index c0ff0fdacfe..cdb6794f222 100644
--- a/src/common/slurm_protocol_socket_common.h
+++ b/src/common/slurm_protocol_socket_common.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_SOCKET_COMMON_H
diff --git a/src/common/slurm_protocol_socket_implementation.c b/src/common/slurm_protocol_socket_implementation.c
index a217ebdaca3..a179ac0733f 100644
--- a/src/common/slurm_protocol_socket_implementation.c
+++ b/src/common/slurm_protocol_socket_implementation.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/slurm_protocol_util.c b/src/common/slurm_protocol_util.c
index 44c3015595c..5c7df81ca35 100644
--- a/src/common/slurm_protocol_util.c
+++ b/src/common/slurm_protocol_util.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/common/slurm_protocol_util.h b/src/common/slurm_protocol_util.h
index 3809195eeb0..3b77397fee2 100644
--- a/src/common/slurm_protocol_util.h
+++ b/src/common/slurm_protocol_util.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURM_PROTOCOL_UTIL_H
diff --git a/src/common/slurm_rlimits_info.c b/src/common/slurm_rlimits_info.c
index 04d626ddd29..5dce456b67e 100644
--- a/src/common/slurm_rlimits_info.c
+++ b/src/common/slurm_rlimits_info.c
@@ -31,7 +31,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/common/slurm_rlimits_info.h b/src/common/slurm_rlimits_info.h
index fc5d53ab066..404fbe14384 100644
--- a/src/common/slurm_rlimits_info.h
+++ b/src/common/slurm_rlimits_info.h
@@ -31,7 +31,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/common/slurm_xlator.h b/src/common/slurm_xlator.h
index c1ef36d3f9a..7019582474e 100644
--- a/src/common/slurm_xlator.h
+++ b/src/common/slurm_xlator.h
@@ -58,7 +58,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_XLATOR_H__
diff --git a/src/common/switch.c b/src/common/switch.c
index 66c0da8abf1..8cfa5bf7c7e 100644
--- a/src/common/switch.c
+++ b/src/common/switch.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/common/switch.h b/src/common/switch.h
index 87be078a555..3f2e055dda1 100644
--- a/src/common/switch.h
+++ b/src/common/switch.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SWITCH_H
diff --git a/src/common/uid.c b/src/common/uid.c
index cd20f74c3f5..6f0f2db4b5b 100644
--- a/src/common/uid.c
+++ b/src/common/uid.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdlib.h>
diff --git a/src/common/uid.h b/src/common/uid.h
index 9e36d5faf4a..7d0ac1c903e 100644
--- a/src/common/uid.h
+++ b/src/common/uid.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_UID_UTILITY_H__
diff --git a/src/common/unsetenv.c b/src/common/unsetenv.c
index b55b3c35923..158c41a7dd6 100644
--- a/src/common/unsetenv.c
+++ b/src/common/unsetenv.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdlib.h>
diff --git a/src/common/unsetenv.h b/src/common/unsetenv.h
index 872e372cd81..e92061b40b0 100644
--- a/src/common/unsetenv.h
+++ b/src/common/unsetenv.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _UNSETENV_H
diff --git a/src/common/util-net.c b/src/common/util-net.c
index 803f50149b0..370227df03c 100644
--- a/src/common/util-net.c
+++ b/src/common/util-net.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with ConMan; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************
  *  Refer to "util-net.h" for documentation on public functions.
 \*****************************************************************************/
diff --git a/src/common/util-net.h b/src/common/util-net.h
index e0667219e4e..120f713c620 100644
--- a/src/common/util-net.h
+++ b/src/common/util-net.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with ConMan; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/common/xassert.c b/src/common/xassert.c
index e32d843c7f1..ca015b12028 100644
--- a/src/common/xassert.c
+++ b/src/common/xassert.c
@@ -34,7 +34,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/xassert.h b/src/common/xassert.h
index 896f885bc7a..a5cad5b61f4 100644
--- a/src/common/xassert.h
+++ b/src/common/xassert.h
@@ -35,7 +35,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _XASSERT_H
diff --git a/src/common/xmalloc.c b/src/common/xmalloc.c
index 3ecf72d9050..307c0aceea7 100644
--- a/src/common/xmalloc.c
+++ b/src/common/xmalloc.c
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/xmalloc.h b/src/common/xmalloc.h
index 2ea54c66de4..54ea9935a6c 100644
--- a/src/common/xmalloc.h
+++ b/src/common/xmalloc.h
@@ -37,7 +37,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************
  * Description:
  *
diff --git a/src/common/xsignal.c b/src/common/xsignal.c
index 6287ca64fd5..dfe9f077b9e 100644
--- a/src/common/xsignal.c
+++ b/src/common/xsignal.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/common/xsignal.h b/src/common/xsignal.h
index 656ff78bd02..b0dd20ec021 100644
--- a/src/common/xsignal.h
+++ b/src/common/xsignal.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _XSIGNAL_H
diff --git a/src/common/xstring.c b/src/common/xstring.c
index 00560717177..f0bcb5a5642 100644
--- a/src/common/xstring.c
+++ b/src/common/xstring.c
@@ -35,7 +35,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/common/xstring.h b/src/common/xstring.h
index eb47f3e2e03..ea456755790 100644
--- a/src/common/xstring.h
+++ b/src/common/xstring.h
@@ -33,7 +33,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _XSTRING_H
diff --git a/src/plugins/auth/authd/auth_authd.c b/src/plugins/auth/authd/auth_authd.c
index 641c078ff65..592c26b99fd 100644
--- a/src/plugins/auth/authd/auth_authd.c
+++ b/src/plugins/auth/authd/auth_authd.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/auth/munge/auth_munge.c b/src/plugins/auth/munge/auth_munge.c
index c24800d28fc..7fcbb178763 100644
--- a/src/plugins/auth/munge/auth_munge.c
+++ b/src/plugins/auth/munge/auth_munge.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/auth/none/auth_none.c b/src/plugins/auth/none/auth_none.c
index 55c26d5b812..6318963a8f8 100644
--- a/src/plugins/auth/none/auth_none.c
+++ b/src/plugins/auth/none/auth_none.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/checkpoint/aix/checkpoint_aix.c b/src/plugins/checkpoint/aix/checkpoint_aix.c
index 51c6e242aaf..ee31cb23230 100644
--- a/src/plugins/checkpoint/aix/checkpoint_aix.c
+++ b/src/plugins/checkpoint/aix/checkpoint_aix.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/checkpoint/none/checkpoint_none.c b/src/plugins/checkpoint/none/checkpoint_none.c
index 7c4f3601ca9..c5afb07e824 100644
--- a/src/plugins/checkpoint/none/checkpoint_none.c
+++ b/src/plugins/checkpoint/none/checkpoint_none.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/jobacct/aix/jobacct_aix.c b/src/plugins/jobacct/aix/jobacct_aix.c
index 31f700088bb..7644d3f6998 100644
--- a/src/plugins/jobacct/aix/jobacct_aix.c
+++ b/src/plugins/jobacct/aix/jobacct_aix.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_linux.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobacct/common/common_slurmctld.c b/src/plugins/jobacct/common/common_slurmctld.c
index 6c835a3ddaf..76be8ee50f7 100644
--- a/src/plugins/jobacct/common/common_slurmctld.c
+++ b/src/plugins/jobacct/common/common_slurmctld.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_linux.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobacct/common/common_slurmstepd.c b/src/plugins/jobacct/common/common_slurmstepd.c
index b2feaf03085..b55863e17e0 100644
--- a/src/plugins/jobacct/common/common_slurmstepd.c
+++ b/src/plugins/jobacct/common/common_slurmstepd.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_linux.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobacct/common/jobacct_common.c b/src/plugins/jobacct/common/jobacct_common.c
index f753dfdfa4e..342e6530a12 100644
--- a/src/plugins/jobacct/common/jobacct_common.c
+++ b/src/plugins/jobacct/common/jobacct_common.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_linux.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobacct/common/jobacct_common.h b/src/plugins/jobacct/common/jobacct_common.h
index 0ca40b89ad6..43d619e91c6 100644
--- a/src/plugins/jobacct/common/jobacct_common.h
+++ b/src/plugins/jobacct/common/jobacct_common.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_linux.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobacct/linux/jobacct_linux.c b/src/plugins/jobacct/linux/jobacct_linux.c
index 4a4bb85500e..6ac5cece890 100644
--- a/src/plugins/jobacct/linux/jobacct_linux.c
+++ b/src/plugins/jobacct/linux/jobacct_linux.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_linux.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobacct/none/jobacct_none.c b/src/plugins/jobacct/none/jobacct_none.c
index d8c9cc99004..87522379dc3 100644
--- a/src/plugins/jobacct/none/jobacct_none.c
+++ b/src/plugins/jobacct/none/jobacct_none.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *
  *  This file is patterned after jobcomp_none.c, written by Morris Jette and
  *  Copyright (C) 2002 The Regents of the University of California.
diff --git a/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c b/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c
index 60dd0ba1374..bde8506c73e 100644
--- a/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c
+++ b/src/plugins/jobcomp/filetxt/jobcomp_filetxt.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/jobcomp/none/jobcomp_none.c b/src/plugins/jobcomp/none/jobcomp_none.c
index 5941f08a9f9..20c7cc6fed2 100644
--- a/src/plugins/jobcomp/none/jobcomp_none.c
+++ b/src/plugins/jobcomp/none/jobcomp_none.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/jobcomp/script/job_record.c b/src/plugins/jobcomp/script/job_record.c
index 325b823f991..0272976f1c3 100644
--- a/src/plugins/jobcomp/script/job_record.c
+++ b/src/plugins/jobcomp/script/job_record.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/jobcomp/script/job_record.h b/src/plugins/jobcomp/script/job_record.h
index 7a01ad05cc8..7198aeea013 100644
--- a/src/plugins/jobcomp/script/job_record.h
+++ b/src/plugins/jobcomp/script/job_record.h
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/plugins/jobcomp/script/jobcomp_script.c b/src/plugins/jobcomp/script/jobcomp_script.c
index 4badf520b97..d590f0f48e4 100644
--- a/src/plugins/jobcomp/script/jobcomp_script.c
+++ b/src/plugins/jobcomp/script/jobcomp_script.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/mpi/lam/lam.h b/src/plugins/mpi/lam/lam.h
index 52605e2a4cf..0d746b47caa 100644
--- a/src/plugins/mpi/lam/lam.h
+++ b/src/plugins/mpi/lam/lam.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/plugins/mpi/lam/mpi_lam.c b/src/plugins/mpi/lam/mpi_lam.c
index d34ef3493dd..2afeed06221 100644
--- a/src/plugins/mpi/lam/mpi_lam.c
+++ b/src/plugins/mpi/lam/mpi_lam.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/mpi/mpichgm/mpi_mpichgm.c b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
index 65087708bef..18a8c625646 100644
--- a/src/plugins/mpi/mpichgm/mpi_mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpi_mpichgm.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/mpi/mpichgm/mpichgm.c b/src/plugins/mpi/mpichgm/mpichgm.c
index c0c8ac4f70a..cfeeece68eb 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.c
+++ b/src/plugins/mpi/mpichgm/mpichgm.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/mpi/mpichgm/mpichgm.h b/src/plugins/mpi/mpichgm/mpichgm.h
index 5474431b3ed..53b8e59e768 100644
--- a/src/plugins/mpi/mpichgm/mpichgm.h
+++ b/src/plugins/mpi/mpichgm/mpichgm.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/plugins/mpi/mvapich/mpi_mvapich.c b/src/plugins/mpi/mvapich/mpi_mvapich.c
index 97a636bb9d8..ecdfcb1b1f9 100644
--- a/src/plugins/mpi/mvapich/mpi_mvapich.c
+++ b/src/plugins/mpi/mvapich/mpi_mvapich.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/mpi/mvapich/mvapich.c b/src/plugins/mpi/mvapich/mvapich.c
index 249eb1c2c84..90b0aee5242 100644
--- a/src/plugins/mpi/mvapich/mvapich.c
+++ b/src/plugins/mpi/mvapich/mvapich.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/mpi/mvapich/mvapich.h b/src/plugins/mpi/mvapich/mvapich.h
index 7c11426972d..8e0bd4508b9 100644
--- a/src/plugins/mpi/mvapich/mvapich.h
+++ b/src/plugins/mpi/mvapich/mvapich.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/plugins/mpi/none/mpi_none.c b/src/plugins/mpi/none/mpi_none.c
index 2950f2a41d8..0cdbfecccf8 100644
--- a/src/plugins/mpi/none/mpi_none.c
+++ b/src/plugins/mpi/none/mpi_none.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/proctrack/aix/proctrack_aix.c b/src/plugins/proctrack/aix/proctrack_aix.c
index 47d9007763a..b019c8e096d 100644
--- a/src/plugins/proctrack/aix/proctrack_aix.c
+++ b/src/plugins/proctrack/aix/proctrack_aix.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/proctrack/linuxproc/kill_tree.c b/src/plugins/proctrack/linuxproc/kill_tree.c
index 754683f59d7..11acf81763d 100644
--- a/src/plugins/proctrack/linuxproc/kill_tree.c
+++ b/src/plugins/proctrack/linuxproc/kill_tree.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/proctrack/linuxproc/kill_tree.h b/src/plugins/proctrack/linuxproc/kill_tree.h
index da57ade5ba0..bb76a1889b3 100644
--- a/src/plugins/proctrack/linuxproc/kill_tree.h
+++ b/src/plugins/proctrack/linuxproc/kill_tree.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_KILL_TREE_H
diff --git a/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c b/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c
index 959e117cc7d..71ead731487 100644
--- a/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c
+++ b/src/plugins/proctrack/linuxproc/proctrack_linuxproc.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/proctrack/pgid/proctrack_pgid.c b/src/plugins/proctrack/pgid/proctrack_pgid.c
index 59fd29e440d..14d811ee6c8 100644
--- a/src/plugins/proctrack/pgid/proctrack_pgid.c
+++ b/src/plugins/proctrack/pgid/proctrack_pgid.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/proctrack/rms/proctrack_rms.c b/src/plugins/proctrack/rms/proctrack_rms.c
index 1ec455c5625..429c781b47b 100644
--- a/src/plugins/proctrack/rms/proctrack_rms.c
+++ b/src/plugins/proctrack/rms/proctrack_rms.c
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #   include "config.h"
diff --git a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
index e3ac9f994c5..9a418b55725 100644
--- a/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
+++ b/src/plugins/proctrack/sgi_job/proctrack_sgi_job.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index b0fef0e697e..34111fa4c75 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -45,7 +45,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/plugins/sched/backfill/backfill.h b/src/plugins/sched/backfill/backfill.h
index 8688cc4b2de..2db7e766bbd 100644
--- a/src/plugins/sched/backfill/backfill.h
+++ b/src/plugins/sched/backfill/backfill.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /* backfill_agent - detached thread periodically attempts to backfill jobs */
diff --git a/src/plugins/sched/backfill/backfill_wrapper.c b/src/plugins/sched/backfill/backfill_wrapper.c
index 57195829c74..dbf33c67cc7 100644
--- a/src/plugins/sched/backfill/backfill_wrapper.c
+++ b/src/plugins/sched/backfill/backfill_wrapper.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/plugins/sched/builtin/builtin_wrapper.c b/src/plugins/sched/builtin/builtin_wrapper.c
index 7dd5109ffce..73cfbf001a7 100644
--- a/src/plugins/sched/builtin/builtin_wrapper.c
+++ b/src/plugins/sched/builtin/builtin_wrapper.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/sched/hold/hold_wrapper.c b/src/plugins/sched/hold/hold_wrapper.c
index b15c7bb18e1..4555cbc9d44 100644
--- a/src/plugins/sched/hold/hold_wrapper.c
+++ b/src/plugins/sched/hold/hold_wrapper.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/sched/maui/agent.cpp b/src/plugins/sched/maui/agent.cpp
index 28296d8a4b0..e38918a83d8 100644
--- a/src/plugins/sched/maui/agent.cpp
+++ b/src/plugins/sched/maui/agent.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 extern "C" {
diff --git a/src/plugins/sched/maui/agent.h b/src/plugins/sched/maui/agent.h
index bf340af0feb..69d7b5a695f 100644
--- a/src/plugins/sched/maui/agent.h
+++ b/src/plugins/sched/maui/agent.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_AGENT_H__
diff --git a/src/plugins/sched/maui/comparator.h b/src/plugins/sched/maui/comparator.h
index a1b510383b9..d49f2065ad4 100644
--- a/src/plugins/sched/maui/comparator.h
+++ b/src/plugins/sched/maui/comparator.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_COMPARATOR_H__
diff --git a/src/plugins/sched/maui/condition.h b/src/plugins/sched/maui/condition.h
index 13790d977f0..41bd4818256 100644
--- a/src/plugins/sched/maui/condition.h
+++ b/src/plugins/sched/maui/condition.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_CONDITION_H__
diff --git a/src/plugins/sched/maui/courier.cpp b/src/plugins/sched/maui/courier.cpp
index fca83fa27ef..dd20f8ff147 100644
--- a/src/plugins/sched/maui/courier.cpp
+++ b/src/plugins/sched/maui/courier.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdlib.h>
diff --git a/src/plugins/sched/maui/courier.h b/src/plugins/sched/maui/courier.h
index fe574ad9217..82742de2368 100644
--- a/src/plugins/sched/maui/courier.h
+++ b/src/plugins/sched/maui/courier.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_COURIER_H__
diff --git a/src/plugins/sched/maui/dstring.cpp b/src/plugins/sched/maui/dstring.cpp
index 11c9e5b9422..75cab667adf 100644
--- a/src/plugins/sched/maui/dstring.cpp
+++ b/src/plugins/sched/maui/dstring.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/plugins/sched/maui/dstring.h b/src/plugins/sched/maui/dstring.h
index 940f12788f3..775ee16223e 100644
--- a/src/plugins/sched/maui/dstring.h
+++ b/src/plugins/sched/maui/dstring.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_DYNAMIC_STRING_H__
diff --git a/src/plugins/sched/maui/mailbag.h b/src/plugins/sched/maui/mailbag.h
index 6a12645a25f..a04022aab10 100644
--- a/src/plugins/sched/maui/mailbag.h
+++ b/src/plugins/sched/maui/mailbag.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_MAILBAG_H__
diff --git a/src/plugins/sched/maui/message.h b/src/plugins/sched/maui/message.h
index c3b2cbde36e..5e3639526ce 100644
--- a/src/plugins/sched/maui/message.h
+++ b/src/plugins/sched/maui/message.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_MESSAGE_H__
diff --git a/src/plugins/sched/maui/prefix_courier.cpp b/src/plugins/sched/maui/prefix_courier.cpp
index 44ce6076abe..a9ad9f18e9d 100644
--- a/src/plugins/sched/maui/prefix_courier.cpp
+++ b/src/plugins/sched/maui/prefix_courier.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/sched/maui/prefix_courier.h b/src/plugins/sched/maui/prefix_courier.h
index 116cef0833e..16ba13821d6 100644
--- a/src/plugins/sched/maui/prefix_courier.h
+++ b/src/plugins/sched/maui/prefix_courier.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __PREFIX_COURIER_H__
diff --git a/src/plugins/sched/maui/receptionist.cpp b/src/plugins/sched/maui/receptionist.cpp
index 520a61ebd91..de971fde1ad 100644
--- a/src/plugins/sched/maui/receptionist.cpp
+++ b/src/plugins/sched/maui/receptionist.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/sched/maui/receptionist.h b/src/plugins/sched/maui/receptionist.h
index a602d1d4607..57e30cdfd4a 100644
--- a/src/plugins/sched/maui/receptionist.h
+++ b/src/plugins/sched/maui/receptionist.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_PLUGIN_RECEPTIONIST_H__
diff --git a/src/plugins/sched/maui/wiki/wiki_canceljob.cpp b/src/plugins/sched/maui/wiki/wiki_canceljob.cpp
index fdf4255ef55..fbd4fdc4bed 100644
--- a/src/plugins/sched/maui/wiki/wiki_canceljob.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_canceljob.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_command.cpp b/src/plugins/sched/maui/wiki/wiki_command.cpp
index 8c1f52e75e8..6c89ca624c8 100644
--- a/src/plugins/sched/maui/wiki/wiki_command.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_command.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "wiki_message.h"
diff --git a/src/plugins/sched/maui/wiki/wiki_mailbag.cpp b/src/plugins/sched/maui/wiki/wiki_mailbag.cpp
index 1cd1052d5f4..a54e22f3f23 100644
--- a/src/plugins/sched/maui/wiki/wiki_mailbag.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_mailbag.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_mailbag.h b/src/plugins/sched/maui/wiki/wiki_mailbag.h
index d1a41bc1344..06c589db62b 100644
--- a/src/plugins/sched/maui/wiki/wiki_mailbag.h
+++ b/src/plugins/sched/maui/wiki/wiki_mailbag.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __WIKI_MAILBAG_H__
diff --git a/src/plugins/sched/maui/wiki/wiki_message.cpp b/src/plugins/sched/maui/wiki/wiki_message.cpp
index c97e8e7ea31..0608ba56d63 100644
--- a/src/plugins/sched/maui/wiki/wiki_message.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_message.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <ctype.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_message.h b/src/plugins/sched/maui/wiki/wiki_message.h
index 3e2e1564d4d..32d9257fbb4 100644
--- a/src/plugins/sched/maui/wiki/wiki_message.h
+++ b/src/plugins/sched/maui/wiki/wiki_message.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __WIKI_MESSAGE_H__
diff --git a/src/plugins/sched/maui/wiki/wiki_parser.cpp b/src/plugins/sched/maui/wiki/wiki_parser.cpp
index b056ba7ca16..501753aa528 100644
--- a/src/plugins/sched/maui/wiki/wiki_parser.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_parser.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_parser.h b/src/plugins/sched/maui/wiki/wiki_parser.h
index 3e81fead1c9..716c25d90e8 100644
--- a/src/plugins/sched/maui/wiki/wiki_parser.h
+++ b/src/plugins/sched/maui/wiki/wiki_parser.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __WIKI_PARSER_H__
diff --git a/src/plugins/sched/maui/wiki/wiki_request.cpp b/src/plugins/sched/maui/wiki/wiki_request.cpp
index 9014a7dbcce..27b43d525d7 100644
--- a/src/plugins/sched/maui/wiki/wiki_request.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_request.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_response.cpp b/src/plugins/sched/maui/wiki/wiki_response.cpp
index 2b00530d7bb..1e929b0d4d6 100644
--- a/src/plugins/sched/maui/wiki/wiki_response.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_response.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "wiki_message.h"
diff --git a/src/plugins/sched/maui/wiki/wiki_startjob.cpp b/src/plugins/sched/maui/wiki/wiki_startjob.cpp
index 2d589268a90..4265a34d273 100644
--- a/src/plugins/sched/maui/wiki/wiki_startjob.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_startjob.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_status.cpp b/src/plugins/sched/maui/wiki/wiki_status.cpp
index 2b4f7c2615f..5af1ba5ae0b 100644
--- a/src/plugins/sched/maui/wiki/wiki_status.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_status.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/plugins/sched/maui/wiki/wiki_wrapper.cpp b/src/plugins/sched/maui/wiki/wiki_wrapper.cpp
index f860a1f20ae..291e3917ecd 100644
--- a/src/plugins/sched/maui/wiki/wiki_wrapper.cpp
+++ b/src/plugins/sched/maui/wiki/wiki_wrapper.cpp
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/sched/wiki2/cancel_job.c b/src/plugins/sched/wiki2/cancel_job.c
index a017fa31bca..569583b38c4 100644
--- a/src/plugins/sched/wiki2/cancel_job.c
+++ b/src/plugins/sched/wiki2/cancel_job.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/sched/wiki2/crypto.c b/src/plugins/sched/wiki2/crypto.c
index b4843648499..153c2ef57bc 100644
--- a/src/plugins/sched/wiki2/crypto.c
+++ b/src/plugins/sched/wiki2/crypto.c
@@ -119,7 +119,7 @@ extern void checksum( char *sum, const char * key, const char * buf )
 	uint32_t crc = 0;
 	uint32_t lword, irword;
 	int idx, buf_len = strlen(buf);
-	uint32_t seed = (uint32_t) strtol( key, NULL, 0 );
+	uint32_t seed = (uint32_t) strtoul( key, NULL, 0 );
 
 	for ( idx = 0; idx < buf_len; ++idx ) {
 		crc = (uint32_t) compute_crc( crc, buf[idx] );
diff --git a/src/plugins/sched/wiki2/get_jobs.c b/src/plugins/sched/wiki2/get_jobs.c
index 7cdf0ca944b..f417a9fd843 100644
--- a/src/plugins/sched/wiki2/get_jobs.c
+++ b/src/plugins/sched/wiki2/get_jobs.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <grp.h>
diff --git a/src/plugins/sched/wiki2/get_nodes.c b/src/plugins/sched/wiki2/get_nodes.c
index f4dd1353c80..91cc00f0454 100644
--- a/src/plugins/sched/wiki2/get_nodes.c
+++ b/src/plugins/sched/wiki2/get_nodes.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/sched/wiki2/job_add_task.c b/src/plugins/sched/wiki2/job_add_task.c
index 763eb3f4cb7..ea98f4abc3c 100644
--- a/src/plugins/sched/wiki2/job_add_task.c
+++ b/src/plugins/sched/wiki2/job_add_task.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/sched/wiki2/job_release_task.c b/src/plugins/sched/wiki2/job_release_task.c
index 200c2bd2023..c032d785f2e 100644
--- a/src/plugins/sched/wiki2/job_release_task.c
+++ b/src/plugins/sched/wiki2/job_release_task.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/sched/wiki2/msg.c b/src/plugins/sched/wiki2/msg.c
index 5b8403b18cc..0ae3020ad63 100644
--- a/src/plugins/sched/wiki2/msg.c
+++ b/src/plugins/sched/wiki2/msg.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./crypto.h"
diff --git a/src/plugins/sched/wiki2/msg.h b/src/plugins/sched/wiki2/msg.h
index d4dd0dbd31a..be698491216 100644
--- a/src/plugins/sched/wiki2/msg.h
+++ b/src/plugins/sched/wiki2/msg.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*
diff --git a/src/plugins/sched/wiki2/resume_job.c b/src/plugins/sched/wiki2/resume_job.c
index e1d24fd3f9f..10dec535f0e 100644
--- a/src/plugins/sched/wiki2/resume_job.c
+++ b/src/plugins/sched/wiki2/resume_job.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/sched/wiki2/sched_wiki.c b/src/plugins/sched/wiki2/sched_wiki.c
index 1aba20709d3..82feca1e0f0 100644
--- a/src/plugins/sched/wiki2/sched_wiki.c
+++ b/src/plugins/sched/wiki2/sched_wiki.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/sched/wiki2/start_job.c b/src/plugins/sched/wiki2/start_job.c
index b2288bc2dfc..af32c9fc1dc 100644
--- a/src/plugins/sched/wiki2/start_job.c
+++ b/src/plugins/sched/wiki2/start_job.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/sched/wiki2/suspend_job.c b/src/plugins/sched/wiki2/suspend_job.c
index 408ff173af4..673423b888f 100644
--- a/src/plugins/sched/wiki2/suspend_job.c
+++ b/src/plugins/sched/wiki2/suspend_job.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "./msg.h"
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index 41e088ce8ff..7d8ea7858a3 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.h b/src/plugins/select/bluegene/block_allocator/block_allocator.h
index 32c63763e3e..e48bc4b20af 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.h
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BLOCK_ALLOCATOR_H_
diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.c b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
index b74a6e45f74..76f6019415b 100644
--- a/src/plugins/select/bluegene/block_allocator/bridge_linker.c
+++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/src/plugins/select/bluegene/block_allocator/bridge_linker.h b/src/plugins/select/bluegene/block_allocator/bridge_linker.h
index 4a60c251e77..d959ddba792 100644
--- a/src/plugins/select/bluegene/block_allocator/bridge_linker.h
+++ b/src/plugins/select/bluegene/block_allocator/bridge_linker.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BRIDGE_LINKER_H_
diff --git a/src/plugins/select/bluegene/plugin/bg_block_info.c b/src/plugins/select/bluegene/plugin/bg_block_info.c
index 47183f580a6..42fb5207f49 100644
--- a/src/plugins/select/bluegene/plugin/bg_block_info.c
+++ b/src/plugins/select/bluegene/plugin/bg_block_info.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/select/bluegene/plugin/bg_block_info.h b/src/plugins/select/bluegene/plugin/bg_block_info.h
index 224fa74e484..9f3e5b0b06b 100644
--- a/src/plugins/select/bluegene/plugin/bg_block_info.h
+++ b/src/plugins/select/bluegene/plugin/bg_block_info.h
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BG_PART_INFO_H_
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index 8ac8ce3d67c..74ef7c16605 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/common/node_select.h"
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.h b/src/plugins/select/bluegene/plugin/bg_job_place.h
index 2d103ec8064..f523b52b19c 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.h
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BG_JOB_PLACE_H_
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.c b/src/plugins/select/bluegene/plugin/bg_job_run.c
index aa13611c31b..e9d93d233a1 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/select/bluegene/plugin/bg_job_run.h b/src/plugins/select/bluegene/plugin/bg_job_run.h
index 14953fb28d9..92db1d14d30 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_run.h
+++ b/src/plugins/select/bluegene/plugin/bg_job_run.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BG_JOB_RUN_H_
diff --git a/src/plugins/select/bluegene/plugin/bg_switch_connections.c b/src/plugins/select/bluegene/plugin/bg_switch_connections.c
index 4a87c7c4776..f885d1c53c5 100644
--- a/src/plugins/select/bluegene/plugin/bg_switch_connections.c
+++ b/src/plugins/select/bluegene/plugin/bg_switch_connections.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "bluegene.h"
diff --git a/src/plugins/select/bluegene/plugin/block_sys.c b/src/plugins/select/bluegene/plugin/block_sys.c
index 4d34279b78b..3564965de22 100755
--- a/src/plugins/select/bluegene/plugin/block_sys.c
+++ b/src/plugins/select/bluegene/plugin/block_sys.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "bluegene.h"
diff --git a/src/plugins/select/bluegene/plugin/bluegene.c b/src/plugins/select/bluegene/plugin/bluegene.c
index 20d66703086..d84a1dac048 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.c
+++ b/src/plugins/select/bluegene/plugin/bluegene.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "bluegene.h"
diff --git a/src/plugins/select/bluegene/plugin/bluegene.h b/src/plugins/select/bluegene/plugin/bluegene.h
index e0752258393..7a9be174e3d 100644
--- a/src/plugins/select/bluegene/plugin/bluegene.h
+++ b/src/plugins/select/bluegene/plugin/bluegene.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BLUEGENE_H_
diff --git a/src/plugins/select/bluegene/plugin/opts.c b/src/plugins/select/bluegene/plugin/opts.c
index a6164421683..6477064ea5c 100644
--- a/src/plugins/select/bluegene/plugin/opts.c
+++ b/src/plugins/select/bluegene/plugin/opts.c
@@ -33,7 +33,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "sfree.h"
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index 165b8d99711..94d50aa4256 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "bluegene.h"
diff --git a/src/plugins/select/bluegene/plugin/sfree.c b/src/plugins/select/bluegene/plugin/sfree.c
index fa796b20a4a..c551bdbc5ca 100644
--- a/src/plugins/select/bluegene/plugin/sfree.c
+++ b/src/plugins/select/bluegene/plugin/sfree.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "sfree.h"
diff --git a/src/plugins/select/bluegene/plugin/sfree.h b/src/plugins/select/bluegene/plugin/sfree.h
index 62c32b45a38..a5914b913df 100644
--- a/src/plugins/select/bluegene/plugin/sfree.h
+++ b/src/plugins/select/bluegene/plugin/sfree.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 
 #ifndef _SFREE_H
diff --git a/src/plugins/select/bluegene/plugin/slurm_epilog.c b/src/plugins/select/bluegene/plugin/slurm_epilog.c
index 439eea73ea9..3e9b168ddb9 100644
--- a/src/plugins/select/bluegene/plugin/slurm_epilog.c
+++ b/src/plugins/select/bluegene/plugin/slurm_epilog.c
@@ -36,7 +36,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/select/bluegene/plugin/slurm_prolog.c b/src/plugins/select/bluegene/plugin/slurm_prolog.c
index 7a9fee109be..95c932f236c 100644
--- a/src/plugins/select/bluegene/plugin/slurm_prolog.c
+++ b/src/plugins/select/bluegene/plugin/slurm_prolog.c
@@ -36,7 +36,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/select/bluegene/plugin/state_test.c b/src/plugins/select/bluegene/plugin/state_test.c
index 2eb993b05c9..ceecb3d1696 100644
--- a/src/plugins/select/bluegene/plugin/state_test.c
+++ b/src/plugins/select/bluegene/plugin/state_test.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/select/bluegene/plugin/state_test.h b/src/plugins/select/bluegene/plugin/state_test.h
index 5f2082c3cc5..b446f80e195 100644
--- a/src/plugins/select/bluegene/plugin/state_test.h
+++ b/src/plugins/select/bluegene/plugin/state_test.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _STATE_TEST_H_
diff --git a/src/plugins/select/cons_res/select_cons_res.c b/src/plugins/select/cons_res/select_cons_res.c
index d448b5ec99c..85ab9b0e099 100644
--- a/src/plugins/select/cons_res/select_cons_res.c
+++ b/src/plugins/select/cons_res/select_cons_res.c
@@ -89,7 +89,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/select/linear/select_linear.c b/src/plugins/select/linear/select_linear.c
index 72cdf85e00a..7970aef1040 100644
--- a/src/plugins/select/linear/select_linear.c
+++ b/src/plugins/select/linear/select_linear.c
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/switch/elan/qsw.c b/src/plugins/switch/elan/qsw.c
index 54849637916..d4edc20429f 100644
--- a/src/plugins/switch/elan/qsw.c
+++ b/src/plugins/switch/elan/qsw.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/plugins/switch/elan/qsw.h b/src/plugins/switch/elan/qsw.h
index 648484c2ad2..ac87fa7b4e6 100644
--- a/src/plugins/switch/elan/qsw.h
+++ b/src/plugins/switch/elan/qsw.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/plugins/switch/elan/switch_elan.c b/src/plugins/switch/elan/switch_elan.c
index 5cffa904ce1..cb31c105505 100644
--- a/src/plugins/switch/elan/switch_elan.c
+++ b/src/plugins/switch/elan/switch_elan.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/switch/federation/federation.c b/src/plugins/switch/federation/federation.c
index 0c5d259f2fe..05efdf50ade 100644
--- a/src/plugins/switch/federation/federation.c
+++ b/src/plugins/switch/federation/federation.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <assert.h>
diff --git a/src/plugins/switch/federation/federation.h b/src/plugins/switch/federation/federation.h
index 8afaadd5ebc..53967249e1e 100644
--- a/src/plugins/switch/federation/federation.h
+++ b/src/plugins/switch/federation/federation.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/plugins/switch/federation/federation_keys.h b/src/plugins/switch/federation/federation_keys.h
index 819b5909cba..3f541248c5d 100644
--- a/src/plugins/switch/federation/federation_keys.h
+++ b/src/plugins/switch/federation/federation_keys.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _FEDERATION_KEYS_INCLUDED
diff --git a/src/plugins/switch/federation/switch_federation.c b/src/plugins/switch/federation/switch_federation.c
index bd733ad4b81..6091e0fe0ab 100644
--- a/src/plugins/switch/federation/switch_federation.c
+++ b/src/plugins/switch/federation/switch_federation.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/switch/none/switch_none.c b/src/plugins/switch/none/switch_none.c
index 0d25fc22beb..0cabe71dfa2 100644
--- a/src/plugins/switch/none/switch_none.c
+++ b/src/plugins/switch/none/switch_none.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/task/affinity/affinity.c b/src/plugins/task/affinity/affinity.c
index 95f614c3bf2..96b069faef0 100644
--- a/src/plugins/task/affinity/affinity.c
+++ b/src/plugins/task/affinity/affinity.c
@@ -30,7 +30,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include "affinity.h"
 
diff --git a/src/plugins/task/affinity/affinity.h b/src/plugins/task/affinity/affinity.h
index 737ad5f6e60..241b237d6bd 100644
--- a/src/plugins/task/affinity/affinity.h
+++ b/src/plugins/task/affinity/affinity.h
@@ -30,7 +30,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/plugins/task/affinity/numa.c b/src/plugins/task/affinity/numa.c
index e6a822cec2e..4ed813da323 100644
--- a/src/plugins/task/affinity/numa.c
+++ b/src/plugins/task/affinity/numa.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include "affinity.h"
 
diff --git a/src/plugins/task/affinity/schedutils.c b/src/plugins/task/affinity/schedutils.c
index 4392e521f67..d5a3716065d 100644
--- a/src/plugins/task/affinity/schedutils.c
+++ b/src/plugins/task/affinity/schedutils.c
@@ -31,7 +31,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <ctype.h>
 #include "affinity.h"
diff --git a/src/plugins/task/affinity/task_affinity.c b/src/plugins/task/affinity/task_affinity.c
index f39b21f9606..2937c5b6ac3 100644
--- a/src/plugins/task/affinity/task_affinity.c
+++ b/src/plugins/task/affinity/task_affinity.c
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/plugins/task/none/task_none.c b/src/plugins/task/none/task_none.c
index 1f72905b92b..7439b867f45 100644
--- a/src/plugins/task/none/task_none.c
+++ b/src/plugins/task/none/task_none.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if     HAVE_CONFIG_H
diff --git a/src/sacct/options.c b/src/sacct/options.c
index 213aa900616..b2242c3e5d3 100644
--- a/src/sacct/options.c
+++ b/src/sacct/options.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/common/read_config.h"
diff --git a/src/sacct/print.c b/src/sacct/print.c
index b8aa973a4e2..f2fb7e1f7d2 100644
--- a/src/sacct/print.c
+++ b/src/sacct/print.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "sacct.h"
diff --git a/src/sacct/process.c b/src/sacct/process.c
index fb16646209f..4197feed240 100644
--- a/src/sacct/process.c
+++ b/src/sacct/process.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "sacct.h"
diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c
index 78e9098c5b7..2227d464815 100644
--- a/src/sacct/sacct.c
+++ b/src/sacct/sacct.c
@@ -30,7 +30,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*
diff --git a/src/sacct/sacct.h b/src/sacct/sacct.h
index 14320634b7b..b4af740465e 100644
--- a/src/sacct/sacct.h
+++ b/src/sacct/sacct.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _SACCT_H
 #define _SACCT_H
diff --git a/src/sacct/sacct_stat.c b/src/sacct/sacct_stat.c
index 2e15a6895f4..dac801ad282 100644
--- a/src/sacct/sacct_stat.c
+++ b/src/sacct/sacct_stat.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "sacct.h"
diff --git a/src/sacct/sacct_stat.h b/src/sacct/sacct_stat.h
index 19776fae655..0b3dbfe3835 100644
--- a/src/sacct/sacct_stat.h
+++ b/src/sacct/sacct_stat.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _SACCT_STAT_H
 #define _SACCT_STAT_H
diff --git a/src/sbcast/agent.c b/src/sbcast/agent.c
index c6447428f1a..4f27a23d396 100644
--- a/src/sbcast/agent.c
+++ b/src/sbcast/agent.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/sbcast/opts.c b/src/sbcast/opts.c
index 63c1e47ef3c..0ff3d178708 100644
--- a/src/sbcast/opts.c
+++ b/src/sbcast/opts.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/sbcast/sbcast.c b/src/sbcast/sbcast.c
index fe03f375c26..eb140fe2b87 100644
--- a/src/sbcast/sbcast.c
+++ b/src/sbcast/sbcast.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/sbcast/sbcast.h b/src/sbcast/sbcast.h
index b50605d2ef5..ba829475e74 100644
--- a/src/sbcast/sbcast.h
+++ b/src/sbcast/sbcast.h
@@ -34,7 +34,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 
 #ifndef _SBCAST_H
diff --git a/src/scancel/opt.c b/src/scancel/opt.c
index 69445e5d9eb..7c9658d4b76 100644
--- a/src/scancel/opt.c
+++ b/src/scancel/opt.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _GNU_SOURCE
diff --git a/src/scancel/scancel.c b/src/scancel/scancel.c
index d35dea5072d..d4e2e7cdcc2 100644
--- a/src/scancel/scancel.c
+++ b/src/scancel/scancel.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
@@ -231,7 +231,7 @@ _cancel_job_id (uint32_t job_id, uint16_t signal)
 	int error_code = SLURM_SUCCESS, i;
 
 	for (i=0; i<MAX_CANCEL_RETRY; i++) {
-		if (signal == (uint16_t)-1) {
+		if ((signal == (uint16_t)-1) || (signal == SIGKILL)) {
 			verbose("Terminating job %u", job_id);
 			error_code = slurm_kill_job (job_id, SIGKILL,
 						     (uint16_t)opt.batch);
diff --git a/src/scancel/scancel.h b/src/scancel/scancel.h
index d9f5a4441b2..cc35b911654 100644
--- a/src/scancel/scancel.h
+++ b/src/scancel/scancel.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_SCANCEL_H
diff --git a/src/scontrol/scontrol.c b/src/scontrol/scontrol.c
index d359371af06..cf26ff3e4bb 100644
--- a/src/scontrol/scontrol.c
+++ b/src/scontrol/scontrol.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index f4a4d138001..44475ece87a 100644
--- a/src/sinfo/opts.c
+++ b/src/sinfo/opts.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/sinfo/print.c b/src/sinfo/print.c
index a137cb2b387..36968ac057c 100644
--- a/src/sinfo/print.c
+++ b/src/sinfo/print.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <ctype.h>
diff --git a/src/sinfo/print.h b/src/sinfo/print.h
index 1ab2a7282a4..9aa6b7b9c02 100644
--- a/src/sinfo/print.h
+++ b/src/sinfo/print.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SINFO_PRINT_H_
diff --git a/src/sinfo/sinfo.c b/src/sinfo/sinfo.c
index f9b5fb1c7f9..fd396238cf5 100644
--- a/src/sinfo/sinfo.c
+++ b/src/sinfo/sinfo.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/sinfo/sinfo.h b/src/sinfo/sinfo.h
index 0208fceab6e..99b1f04c87a 100644
--- a/src/sinfo/sinfo.h
+++ b/src/sinfo/sinfo.h
@@ -34,7 +34,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 
 #ifndef _SINFO_H
diff --git a/src/sinfo/sort.c b/src/sinfo/sort.c
index 3ce15605142..ec30b682b6c 100644
--- a/src/sinfo/sort.c
+++ b/src/sinfo/sort.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <ctype.h>
diff --git a/src/slurmctld/agent.c b/src/slurmctld/agent.c
index aebff758619..0d534614a4a 100644
--- a/src/slurmctld/agent.c
+++ b/src/slurmctld/agent.c
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
  *****************************************************************************
  *  Theory of operation:
  *
diff --git a/src/slurmctld/agent.h b/src/slurmctld/agent.h
index 98f4bd08fce..1bad018e82f 100644
--- a/src/slurmctld/agent.h
+++ b/src/slurmctld/agent.h
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _AGENT_H
diff --git a/src/slurmctld/backup.c b/src/slurmctld/backup.c
index 2df3a5389c5..924ed081b50 100644
--- a/src/slurmctld/backup.c
+++ b/src/slurmctld/backup.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/controller.c b/src/slurmctld/controller.c
index f976dd600eb..ac39d36fe87 100644
--- a/src/slurmctld/controller.c
+++ b/src/slurmctld/controller.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index 430f11dbfa3..41b2ce750db 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -36,7 +36,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/job_scheduler.c b/src/slurmctld/job_scheduler.c
index b7f9e42290f..1ee8cdb2c1e 100644
--- a/src/slurmctld/job_scheduler.c
+++ b/src/slurmctld/job_scheduler.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/locks.c b/src/slurmctld/locks.c
index 8ffe402e9e6..369a5da614f 100644
--- a/src/slurmctld/locks.c
+++ b/src/slurmctld/locks.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/locks.h b/src/slurmctld/locks.h
index b594c480090..927337ffda9 100644
--- a/src/slurmctld/locks.h
+++ b/src/slurmctld/locks.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*****************************************************************************\
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index 5c79e859401..a6c0260ebd5 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -48,7 +48,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 90145f3ec1d..ee7d6a90d45 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -46,7 +46,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/node_scheduler.h b/src/slurmctld/node_scheduler.h
index c41db267e33..6d7db4828f4 100644
--- a/src/slurmctld/node_scheduler.h
+++ b/src/slurmctld/node_scheduler.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_NODE_SCHEDULER_H
diff --git a/src/slurmctld/partition_mgr.c b/src/slurmctld/partition_mgr.c
index 9c6ca21401f..06bccea7e3a 100644
--- a/src/slurmctld/partition_mgr.c
+++ b/src/slurmctld/partition_mgr.c
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/ping_nodes.c b/src/slurmctld/ping_nodes.c
index b89ddfc00c4..9e19c236710 100644
--- a/src/slurmctld/ping_nodes.c
+++ b/src/slurmctld/ping_nodes.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/ping_nodes.h b/src/slurmctld/ping_nodes.h
index f3e69ba4492..7051fd24c09 100644
--- a/src/slurmctld/ping_nodes.h
+++ b/src/slurmctld/ping_nodes.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_PING_NODES_H
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 0a2ccf895b5..dc19009b23d 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/proc_req.h b/src/slurmctld/proc_req.h
index f1e37bc6c1f..45742cded48 100644
--- a/src/slurmctld/proc_req.h
+++ b/src/slurmctld/proc_req.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_PROC_REQ_H
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index 11bf549c078..5d5b60c0c69 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/read_config.h b/src/slurmctld/read_config.h
index fe9efcf1c2e..94323c76039 100644
--- a/src/slurmctld/read_config.h
+++ b/src/slurmctld/read_config.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_READ_CONFIG_H
diff --git a/src/slurmctld/sched_plugin.c b/src/slurmctld/sched_plugin.c
index dab01382c92..952b07fc0b2 100644
--- a/src/slurmctld/sched_plugin.c
+++ b/src/slurmctld/sched_plugin.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/slurmctld/sched_plugin.h b/src/slurmctld/sched_plugin.h
index 53dffed13dd..860a91333a9 100644
--- a/src/slurmctld/sched_plugin.h
+++ b/src/slurmctld/sched_plugin.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SLURM_CONTROLLER_SCHED_PLUGIN_API_H__
diff --git a/src/slurmctld/sched_upcalls.c b/src/slurmctld/sched_upcalls.c
index f181e6fd050..bd4ebea2949 100644
--- a/src/slurmctld/sched_upcalls.c
+++ b/src/slurmctld/sched_upcalls.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/src/slurmctld/slurmctld.h b/src/slurmctld/slurmctld.h
index faee62a91b4..db103e3700a 100644
--- a/src/slurmctld/slurmctld.h
+++ b/src/slurmctld/slurmctld.h
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_SLURMCTLD_H
diff --git a/src/slurmctld/srun_comm.c b/src/slurmctld/srun_comm.c
index e2f1d7e7043..a863aa0f502 100644
--- a/src/slurmctld/srun_comm.c
+++ b/src/slurmctld/srun_comm.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/srun_comm.h b/src/slurmctld/srun_comm.h
index dc3629cd07f..8459d2ea9b0 100644
--- a/src/slurmctld/srun_comm.h
+++ b/src/slurmctld/srun_comm.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_SRUN_COMM_H
diff --git a/src/slurmctld/state_save.c b/src/slurmctld/state_save.c
index dd079b01972..b4fb384ad51 100644
--- a/src/slurmctld/state_save.c
+++ b/src/slurmctld/state_save.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmctld/state_save.h b/src/slurmctld/state_save.h
index 2d92a63c979..7498fae33bd 100644
--- a/src/slurmctld/state_save.h
+++ b/src/slurmctld/state_save.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /* Queue saving of job state information */
diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index f5c57ec7316..ebcbe38facc 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmd/common/proctrack.c b/src/slurmd/common/proctrack.c
index f75ddf6b6b6..8a8bba4316d 100644
--- a/src/slurmd/common/proctrack.c
+++ b/src/slurmd/common/proctrack.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/slurmd/common/proctrack.h b/src/slurmd/common/proctrack.h
index 2aa8d9e1517..df83395c6bb 100644
--- a/src/slurmd/common/proctrack.h
+++ b/src/slurmd/common/proctrack.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __PROC_TRACK_H__
diff --git a/src/slurmd/common/reverse_tree.h b/src/slurmd/common/reverse_tree.h
index 43fda840225..cc980441c08 100644
--- a/src/slurmd/common/reverse_tree.h
+++ b/src/slurmd/common/reverse_tree.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _REVERSE_TREE_H
 #define _REVERSE_TREE_H
diff --git a/src/slurmd/common/run_script.c b/src/slurmd/common/run_script.c
index 402c47a81a4..0d4d10606c7 100644
--- a/src/slurmd/common/run_script.c
+++ b/src/slurmd/common/run_script.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/common/run_script.h b/src/slurmd/common/run_script.h
index ff5b5c5afbe..c5fc807ec33 100644
--- a/src/slurmd/common/run_script.h
+++ b/src/slurmd/common/run_script.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _RUN_SCRIPT_H
diff --git a/src/slurmd/common/setproctitle.c b/src/slurmd/common/setproctitle.c
index 52908c5de87..d91bcae7b0e 100644
--- a/src/slurmd/common/setproctitle.c
+++ b/src/slurmd/common/setproctitle.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 /*
diff --git a/src/slurmd/common/setproctitle.h b/src/slurmd/common/setproctitle.h
index d1042a34ef1..e21d3b5565d 100644
--- a/src/slurmd/common/setproctitle.h
+++ b/src/slurmd/common/setproctitle.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _BSD_SETPROCTITLE_H
diff --git a/src/slurmd/common/slurmstepd_init.c b/src/slurmd/common/slurmstepd_init.c
index 255c6424b6a..f88b1c57a0d 100644
--- a/src/slurmd/common/slurmstepd_init.c
+++ b/src/slurmd/common/slurmstepd_init.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/slurmd/common/slurmstepd_init.h"
diff --git a/src/slurmd/common/slurmstepd_init.h b/src/slurmd/common/slurmstepd_init.h
index 30e1ead7917..2636e4448c6 100644
--- a/src/slurmd/common/slurmstepd_init.h
+++ b/src/slurmd/common/slurmstepd_init.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMD_STEP_INIT_H
diff --git a/src/slurmd/common/stepd_api.c b/src/slurmd/common/stepd_api.c
index af5c243a96d..3ee17ea76ca 100644
--- a/src/slurmd/common/stepd_api.c
+++ b/src/slurmd/common/stepd_api.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #define _GNU_SOURCE
diff --git a/src/slurmd/common/stepd_api.h b/src/slurmd/common/stepd_api.h
index 9a999585d84..39f2c7dea6a 100644
--- a/src/slurmd/common/stepd_api.h
+++ b/src/slurmd/common/stepd_api.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _STEPD_API_H
diff --git a/src/slurmd/common/task_plugin.c b/src/slurmd/common/task_plugin.c
index 209cd189c41..81848d7d4b5 100644
--- a/src/slurmd/common/task_plugin.c
+++ b/src/slurmd/common/task_plugin.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <pthread.h>
diff --git a/src/slurmd/common/task_plugin.h b/src/slurmd/common/task_plugin.h
index 0b7fdefec29..c7422a483de 100644
--- a/src/slurmd/common/task_plugin.h
+++ b/src/slurmd/common/task_plugin.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMD_TASK_PLUGIN_H_
diff --git a/src/slurmd/slurmd/get_mach_stat.c b/src/slurmd/slurmd/get_mach_stat.c
index dceab7a3e70..c302f26f415 100644
--- a/src/slurmd/slurmd/get_mach_stat.c
+++ b/src/slurmd/slurmd/get_mach_stat.c
@@ -37,7 +37,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmd/slurmd/get_mach_stat.h b/src/slurmd/slurmd/get_mach_stat.h
index fbf7173bed0..f0130952740 100644
--- a/src/slurmd/slurmd/get_mach_stat.h
+++ b/src/slurmd/slurmd/get_mach_stat.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with ConMan; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _GET_MACH_STAT_H
diff --git a/src/slurmd/slurmd/read_proc.c b/src/slurmd/slurmd/read_proc.c
index 8dddf8459fe..adc8bc2ba61 100644
--- a/src/slurmd/slurmd/read_proc.c
+++ b/src/slurmd/slurmd/read_proc.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with ConMan; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/slurmd/slurmd/req.c b/src/slurmd/slurmd/req.c
index 6c10cf789c1..3b75c4741fc 100644
--- a/src/slurmd/slurmd/req.c
+++ b/src/slurmd/slurmd/req.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #if HAVE_CONFIG_H
 #  include "config.h"
diff --git a/src/slurmd/slurmd/req.h b/src/slurmd/slurmd/req.h
index d1db364bd97..652109006b4 100644
--- a/src/slurmd/slurmd/req.h
+++ b/src/slurmd/slurmd/req.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _REQ_H
 #define _REQ_H
diff --git a/src/slurmd/slurmd/reverse_tree_math.c b/src/slurmd/slurmd/reverse_tree_math.c
index 450d6246a17..f5c79a64b30 100644
--- a/src/slurmd/slurmd/reverse_tree_math.c
+++ b/src/slurmd/slurmd/reverse_tree_math.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/slurmd/slurmd/reverse_tree_math.h b/src/slurmd/slurmd/reverse_tree_math.h
index 26ebea32d63..2237e86f1a9 100644
--- a/src/slurmd/slurmd/reverse_tree_math.h
+++ b/src/slurmd/slurmd/reverse_tree_math.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _REVERSE_TREE_MATH_H
 #define _REVERSE_TREE_MATH_H
diff --git a/src/slurmd/slurmd/slurmd.c b/src/slurmd/slurmd/slurmd.c
index 29ecf6f0a04..d7265fae01c 100644
--- a/src/slurmd/slurmd/slurmd.c
+++ b/src/slurmd/slurmd/slurmd.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmd/slurmd.h b/src/slurmd/slurmd/slurmd.h
index cd903c7fb42..8b565f9b8ca 100644
--- a/src/slurmd/slurmd/slurmd.h
+++ b/src/slurmd/slurmd/slurmd.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _SLURMD_H
 #define _SLURMD_H
diff --git a/src/slurmd/slurmd/xcpu.c b/src/slurmd/slurmd/xcpu.c
index ab828b56604..0a47bc326df 100644
--- a/src/slurmd/slurmd/xcpu.c
+++ b/src/slurmd/slurmd/xcpu.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmd/xcpu.h b/src/slurmd/slurmd/xcpu.h
index f8ccd3c785b..75379a35c3d 100644
--- a/src/slurmd/slurmd/xcpu.h
+++ b/src/slurmd/slurmd/xcpu.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _XCPU_H
diff --git a/src/slurmd/slurmstepd/fname.c b/src/slurmd/slurmstepd/fname.c
index e6ffd614d55..41e79362344 100644
--- a/src/slurmd/slurmstepd/fname.c
+++ b/src/slurmd/slurmstepd/fname.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/slurmd/slurmstepd/fname.h b/src/slurmd/slurmstepd/fname.h
index ad1217721a9..0c28e028890 100644
--- a/src/slurmd/slurmstepd/fname.h
+++ b/src/slurmd/slurmstepd/fname.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMD_FNAME_H
diff --git a/src/slurmd/slurmstepd/io.c b/src/slurmd/slurmstepd/io.c
index 1106d3c1eb5..b2bc63d52c9 100644
--- a/src/slurmd/slurmstepd/io.c
+++ b/src/slurmd/slurmstepd/io.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/io.h b/src/slurmd/slurmstepd/io.h
index 305419b69b5..11436051fc5 100644
--- a/src/slurmd/slurmstepd/io.h
+++ b/src/slurmd/slurmstepd/io.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _IO_H
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index c22d129e8d1..ada8907aa43 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/mgr.h b/src/slurmd/slurmstepd/mgr.h
index effd5d288a9..bcb4c859af0 100644
--- a/src/slurmd/slurmstepd/mgr.h
+++ b/src/slurmd/slurmstepd/mgr.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _MGR_H
 #define _MGR_H
diff --git a/src/slurmd/slurmstepd/pam_ses.c b/src/slurmd/slurmstepd/pam_ses.c
index 7914bd6ba2b..fd4d7ae21ca 100644
--- a/src/slurmd/slurmstepd/pam_ses.c
+++ b/src/slurmd/slurmstepd/pam_ses.c
@@ -33,7 +33,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/pam_ses.h b/src/slurmd/slurmstepd/pam_ses.h
index f698ddc68aa..8e9306b68fa 100644
--- a/src/slurmd/slurmstepd/pam_ses.h
+++ b/src/slurmd/slurmstepd/pam_ses.h
@@ -34,7 +34,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMD_PAMSES_H
diff --git a/src/slurmd/slurmstepd/pdebug.c b/src/slurmd/slurmstepd/pdebug.c
index e59cadaf9bc..a24eca4fc04 100644
--- a/src/slurmd/slurmstepd/pdebug.c
+++ b/src/slurmd/slurmstepd/pdebug.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include "pdebug.h"
 
diff --git a/src/slurmd/slurmstepd/pdebug.h b/src/slurmd/slurmstepd/pdebug.h
index d42f7379008..a545826429b 100644
--- a/src/slurmd/slurmstepd/pdebug.h
+++ b/src/slurmd/slurmstepd/pdebug.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _PDEBUG_H
 #define _PDEBUG_H
diff --git a/src/slurmd/slurmstepd/req.c b/src/slurmd/slurmstepd/req.c
index b7130fb2198..31e4314bb97 100644
--- a/src/slurmd/slurmstepd/req.c
+++ b/src/slurmd/slurmstepd/req.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/req.h b/src/slurmd/slurmstepd/req.h
index 1b9a99aa828..bd30691d8c5 100644
--- a/src/slurmd/slurmstepd/req.h
+++ b/src/slurmd/slurmstepd/req.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _STEP_REQ_H
diff --git a/src/slurmd/slurmstepd/slurmstepd.c b/src/slurmd/slurmstepd/slurmstepd.c
index d41402a135a..609f3032645 100644
--- a/src/slurmd/slurmstepd/slurmstepd.c
+++ b/src/slurmd/slurmstepd/slurmstepd.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/slurmstepd.h b/src/slurmd/slurmstepd/slurmstepd.h
index 4a8351f2d06..56123151008 100644
--- a/src/slurmd/slurmstepd/slurmstepd.h
+++ b/src/slurmd/slurmstepd/slurmstepd.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMSTEPD_H
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.c b/src/slurmd/slurmstepd/slurmstepd_job.c
index 1ae785c65dd..315b4cfcdab 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.c
+++ b/src/slurmd/slurmstepd/slurmstepd_job.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.h b/src/slurmd/slurmstepd/slurmstepd_job.h
index ab6a2a6e130..16cd1233bbd 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.h
+++ b/src/slurmd/slurmstepd/slurmstepd_job.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMSTEPD_JOB_H
diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index 6d3cb84f4a3..22ae748d30c 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/task.h b/src/slurmd/slurmstepd/task.h
index 57b661e53ea..cbb910dd6e2 100644
--- a/src/slurmd/slurmstepd/task.h
+++ b/src/slurmd/slurmstepd/task.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _TASK_H
diff --git a/src/slurmd/slurmstepd/task_exec.c b/src/slurmd/slurmstepd/task_exec.c
index a009197041e..0ce625ad7ad 100644
--- a/src/slurmd/slurmstepd/task_exec.c
+++ b/src/slurmd/slurmstepd/task_exec.c
@@ -39,7 +39,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/src/slurmd/slurmstepd/task_exec.h b/src/slurmd/slurmstepd/task_exec.h
index a31dc120c82..5d6047e7f51 100644
--- a/src/slurmd/slurmstepd/task_exec.h
+++ b/src/slurmd/slurmstepd/task_exec.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMD_TASK_EXEC_H
diff --git a/src/slurmd/slurmstepd/ulimits.c b/src/slurmd/slurmstepd/ulimits.c
index 4692ffad08e..76009e1c22a 100644
--- a/src/slurmd/slurmstepd/ulimits.c
+++ b/src/slurmd/slurmstepd/ulimits.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/slurmd/slurmstepd/ulimits.h b/src/slurmd/slurmstepd/ulimits.h
index b136644fe52..122e9015ce0 100644
--- a/src/slurmd/slurmstepd/ulimits.h
+++ b/src/slurmd/slurmstepd/ulimits.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SLURMD_ULIMITS_H
diff --git a/src/smap/configure_functions.c b/src/smap/configure_functions.c
index cff558e00d4..8b5805326d3 100644
--- a/src/smap/configure_functions.c
+++ b/src/smap/configure_functions.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/common/uid.h"
diff --git a/src/smap/grid_functions.c b/src/smap/grid_functions.c
index fcba888a90c..3983598e2c2 100644
--- a/src/smap/grid_functions.c
+++ b/src/smap/grid_functions.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/smap/smap.h"
diff --git a/src/smap/job_functions.c b/src/smap/job_functions.c
index f5a9f828aab..38687596950 100644
--- a/src/smap/job_functions.c
+++ b/src/smap/job_functions.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/common/uid.h"
diff --git a/src/smap/opts.c b/src/smap/opts.c
index 505907bd146..70ff08ae0e8 100644
--- a/src/smap/opts.c
+++ b/src/smap/opts.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/smap/smap.h"
diff --git a/src/smap/partition_functions.c b/src/smap/partition_functions.c
index d2a5a6f2035..ea8fe6c8111 100644
--- a/src/smap/partition_functions.c
+++ b/src/smap/partition_functions.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/smap/smap.h"
diff --git a/src/smap/smap.c b/src/smap/smap.c
index cb5a2cf3031..75a03dd6821 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "config.h"
diff --git a/src/smap/smap.h b/src/smap/smap.h
index e2319e476f5..0139de7abec 100644
--- a/src/smap/smap.h
+++ b/src/smap/smap.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \****************************************************************************/
 
 #ifndef _SMAP_H
diff --git a/src/squeue/opts.c b/src/squeue/opts.c
index 4261bc5aca1..b14fb7e3ef9 100644
--- a/src/squeue/opts.c
+++ b/src/squeue/opts.c
@@ -34,7 +34,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _GNU_SOURCE
diff --git a/src/squeue/print.c b/src/squeue/print.c
index 252e248f4d6..11d5013d01b 100644
--- a/src/squeue/print.c
+++ b/src/squeue/print.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <time.h>
diff --git a/src/squeue/print.h b/src/squeue/print.h
index 4af5238817c..4cd11dc1c25 100644
--- a/src/squeue/print.h
+++ b/src/squeue/print.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SQUEUE_PRINT_H_
diff --git a/src/squeue/sort.c b/src/squeue/sort.c
index 44f56ab69ff..7a69d61dad2 100644
--- a/src/squeue/sort.c
+++ b/src/squeue/sort.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <grp.h>
diff --git a/src/squeue/squeue.c b/src/squeue/squeue.c
index da5f9ab5af8..7152da75c33 100644
--- a/src/squeue/squeue.c
+++ b/src/squeue/squeue.c
@@ -35,7 +35,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/squeue/squeue.h b/src/squeue/squeue.h
index 8f502e59b0d..f81c2c3ba29 100644
--- a/src/squeue/squeue.h
+++ b/src/squeue/squeue.h
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef __SQUEUE_H__
diff --git a/src/srun/allocate.c b/src/srun/allocate.c
index aa4d71c3d15..5508ca0ec3d 100644
--- a/src/srun/allocate.c
+++ b/src/srun/allocate.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/allocate.h b/src/srun/allocate.h
index 9ccb2a4824a..1a8f6f16738 100644
--- a/src/srun/allocate.h
+++ b/src/srun/allocate.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_ALLOCATE_H
diff --git a/src/srun/attach.c b/src/srun/attach.c
index b5e9542a0a7..0e4910368dc 100644
--- a/src/srun/attach.c
+++ b/src/srun/attach.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/core-format.c b/src/srun/core-format.c
index f62879e3dba..60f47682455 100644
--- a/src/srun/core-format.c
+++ b/src/srun/core-format.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/core-format.h b/src/srun/core-format.h
index 432daa3f697..1a3802edf32 100644
--- a/src/srun/core-format.h
+++ b/src/srun/core-format.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_CORE_FORMAT_H
diff --git a/src/srun/fname.c b/src/srun/fname.c
index c7c5f55f1d6..8ede6552817 100644
--- a/src/srun/fname.c
+++ b/src/srun/fname.c
@@ -32,7 +32,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/srun/fname.h b/src/srun/fname.h
index 46675f1e0c2..cd3b939f607 100644
--- a/src/srun/fname.h
+++ b/src/srun/fname.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _FNAME_H
diff --git a/src/srun/launch.c b/src/srun/launch.c
index c3b353cf874..d77562ae6c9 100644
--- a/src/srun/launch.c
+++ b/src/srun/launch.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/launch.h b/src/srun/launch.h
index 010783c8b53..4bb74ef0499 100644
--- a/src/srun/launch.h
+++ b/src/srun/launch.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_LAUNCH_H
diff --git a/src/srun/msg.c b/src/srun/msg.c
index 154e6e60f12..eab2b4b1f26 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/msg.h b/src/srun/msg.h
index 6dcab49699d..b19c9ba4545 100644
--- a/src/srun/msg.h
+++ b/src/srun/msg.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include "src/srun/srun_job.h"
diff --git a/src/srun/multi_prog.c b/src/srun/multi_prog.c
index 74fc48965db..d69edb1dcec 100644
--- a/src/srun/multi_prog.c
+++ b/src/srun/multi_prog.c
@@ -39,7 +39,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/srun/multi_prog.h b/src/srun/multi_prog.h
index 1ef2e58536c..b6d6dfe0fc3 100644
--- a/src/srun/multi_prog.h
+++ b/src/srun/multi_prog.h
@@ -35,7 +35,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _SRUN_MULTI_PROG_H
 #define _SRUN_MULTI_PROG_H
diff --git a/src/srun/opt.c b/src/srun/opt.c
index 749c2004938..982db66370d 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/opt.h b/src/srun/opt.h
index 40d226c97cd..b3f21a6181e 100644
--- a/src/srun/opt.h
+++ b/src/srun/opt.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _HAVE_OPT_H
diff --git a/src/srun/reattach.c b/src/srun/reattach.c
index 56be2471e06..245d1fa8861 100644
--- a/src/srun/reattach.c
+++ b/src/srun/reattach.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/reattach.h b/src/srun/reattach.h
index 258a5464d24..2d2e20c7659 100644
--- a/src/srun/reattach.h
+++ b/src/srun/reattach.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _REATTACH_H
diff --git a/src/srun/signals.c b/src/srun/signals.c
index ed028410a38..34b4683666a 100644
--- a/src/srun/signals.c
+++ b/src/srun/signals.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/srun/signals.h b/src/srun/signals.h
index 29fdd799444..14f6412d557 100644
--- a/src/srun/signals.h
+++ b/src/srun/signals.h
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SIGNALS_H
diff --git a/src/srun/sigstr.c b/src/srun/sigstr.c
index f3cb25c48ce..4c61d6e1eb0 100644
--- a/src/srun/sigstr.c
+++ b/src/srun/sigstr.c
@@ -32,7 +32,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #if HAVE_CONFIG_H
diff --git a/src/srun/sigstr.h b/src/srun/sigstr.h
index c536a2fa33b..82464fad4ad 100644
--- a/src/srun/sigstr.h
+++ b/src/srun/sigstr.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifndef _SIGSTR_H
diff --git a/src/srun/srun.c b/src/srun/srun.c
index 7f6bd4c9dc4..b63fe589d4a 100644
--- a/src/srun/srun.c
+++ b/src/srun/srun.c
@@ -34,7 +34,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/srun/srun_job.c b/src/srun/srun_job.c
index 10c8249fc2e..0cd4be3e2d5 100644
--- a/src/srun/srun_job.c
+++ b/src/srun/srun_job.c
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/srun/srun_job.h b/src/srun/srun_job.h
index 6ae9ce0e750..7d1e993ef4a 100644
--- a/src/srun/srun_job.h
+++ b/src/srun/srun_job.h
@@ -33,7 +33,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #ifndef _HAVE_JOB_H
 #define _HAVE_JOB_H
diff --git a/testsuite/expect/README b/testsuite/expect/README
index a38429ea40b..b67936d6926 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -19,7 +19,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 
 This directory contains a battery of SLURM regression tests. The tests make use 
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index a25afdb4bb2..2c06d814f78 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 
 global sacct salloc sattach sbatch sbcast scancel scontrol sinfo slaunch smap squeue srun
diff --git a/testsuite/expect/pkill b/testsuite/expect/pkill
index 177973780d4..883291c4a9e 100755
--- a/testsuite/expect/pkill
+++ b/testsuite/expect/pkill
@@ -24,7 +24,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 #
 # Read command line options
diff --git a/testsuite/expect/regression b/testsuite/expect/regression
index bfbec1cf3f3..6e93c4b7cec 100755
--- a/testsuite/expect/regression
+++ b/testsuite/expect/regression
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 
 FAILURES=0
diff --git a/testsuite/expect/regression.py b/testsuite/expect/regression.py
index 8ed3f882d09..cc8153a4e67 100755
--- a/testsuite/expect/regression.py
+++ b/testsuite/expect/regression.py
@@ -20,7 +20,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 
 """This script makes it easier to run the SLURM expect test scripts."""
diff --git a/testsuite/expect/test1.1 b/testsuite/expect/test1.1
index 1d30688132c..4787920a2ed 100755
--- a/testsuite/expect/test1.1
+++ b/testsuite/expect/test1.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10
index 9a6d71b5697..cc08b512db0 100755
--- a/testsuite/expect/test1.10
+++ b/testsuite/expect/test1.10
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.11 b/testsuite/expect/test1.11
index bc5621fb336..2ea654fe29b 100755
--- a/testsuite/expect/test1.11
+++ b/testsuite/expect/test1.11
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.12 b/testsuite/expect/test1.12
index c8fc11eb163..7c2d3dd561c 100755
--- a/testsuite/expect/test1.12
+++ b/testsuite/expect/test1.12
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.13 b/testsuite/expect/test1.13
index 711bef528fb..20970eaf251 100755
--- a/testsuite/expect/test1.13
+++ b/testsuite/expect/test1.13
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index f6b3e6800aa..e0b5c76d139 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index cd693c8c11e..01a9848e4d6 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index 62a5c4e38f4..fb5f06b4a45 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.17 b/testsuite/expect/test1.17
index ec1c3ce9895..ab8d10783a0 100755
--- a/testsuite/expect/test1.17
+++ b/testsuite/expect/test1.17
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.18 b/testsuite/expect/test1.18
index 07d41ee320e..ce22cf2a27e 100755
--- a/testsuite/expect/test1.18
+++ b/testsuite/expect/test1.18
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.18.prog.c b/testsuite/expect/test1.18.prog.c
index 49ece0b19c4..aa1c68d66f9 100644
--- a/testsuite/expect/test1.18.prog.c
+++ b/testsuite/expect/test1.18.prog.c
@@ -22,7 +22,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index 6e723d432ef..cb74d07fc16 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index ae5b6554651..43302bb3bbe 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.20 b/testsuite/expect/test1.20
index 4da9969de2a..661875ce48b 100755
--- a/testsuite/expect/test1.20
+++ b/testsuite/expect/test1.20
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index f2642569d45..794b7268dda 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index 1e0f2c5ef80..9ab76e5903a 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.23 b/testsuite/expect/test1.23
index 2de69ee0a8e..ea1f5588a5e 100755
--- a/testsuite/expect/test1.23
+++ b/testsuite/expect/test1.23
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.24 b/testsuite/expect/test1.24
index 99c3f742238..03a3783546c 100755
--- a/testsuite/expect/test1.24
+++ b/testsuite/expect/test1.24
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.25 b/testsuite/expect/test1.25
index c05aee97b85..7c6d06f5892 100755
--- a/testsuite/expect/test1.25
+++ b/testsuite/expect/test1.25
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.26 b/testsuite/expect/test1.26
index 9a339e8d358..bf90382ddfc 100755
--- a/testsuite/expect/test1.26
+++ b/testsuite/expect/test1.26
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.27 b/testsuite/expect/test1.27
index e2adcf0d66b..6d8fe3a0b5b 100755
--- a/testsuite/expect/test1.27
+++ b/testsuite/expect/test1.27
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.28 b/testsuite/expect/test1.28
index 92bc3415c8a..2aae4a492bc 100755
--- a/testsuite/expect/test1.28
+++ b/testsuite/expect/test1.28
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.29 b/testsuite/expect/test1.29
index 464f12ff4df..5ed500f6efe 100755
--- a/testsuite/expect/test1.29
+++ b/testsuite/expect/test1.29
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.29.prog.c b/testsuite/expect/test1.29.prog.c
index ceef5185a66..beb9e10e54d 100644
--- a/testsuite/expect/test1.29.prog.c
+++ b/testsuite/expect/test1.29.prog.c
@@ -23,7 +23,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/testsuite/expect/test1.3 b/testsuite/expect/test1.3
index 697fcf0240d..9e037a53494 100755
--- a/testsuite/expect/test1.3
+++ b/testsuite/expect/test1.3
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.30 b/testsuite/expect/test1.30
index 11cd14329fc..bb149952d1d 100755
--- a/testsuite/expect/test1.30
+++ b/testsuite/expect/test1.30
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.31 b/testsuite/expect/test1.31
index 23d17052558..fca0bfaaa39 100755
--- a/testsuite/expect/test1.31
+++ b/testsuite/expect/test1.31
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.32 b/testsuite/expect/test1.32
index df92e9e642b..6fd60f4feed 100755
--- a/testsuite/expect/test1.32
+++ b/testsuite/expect/test1.32
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.32.prog.c b/testsuite/expect/test1.32.prog.c
index c69a799b572..85cb340da71 100644
--- a/testsuite/expect/test1.32.prog.c
+++ b/testsuite/expect/test1.32.prog.c
@@ -22,7 +22,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <signal.h>
 #include <stdio.h>
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index 46a67ec277d..63f6d778c52 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.34 b/testsuite/expect/test1.34
index 7087d62f075..b97deefd891 100755
--- a/testsuite/expect/test1.34
+++ b/testsuite/expect/test1.34
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index 158b3dda059..ba277667aba 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.36 b/testsuite/expect/test1.36
index 67239622a94..e1cd00443ed 100755
--- a/testsuite/expect/test1.36
+++ b/testsuite/expect/test1.36
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.37 b/testsuite/expect/test1.37
index 685273d1d80..bf8e57c10af 100755
--- a/testsuite/expect/test1.37
+++ b/testsuite/expect/test1.37
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.38 b/testsuite/expect/test1.38
index 4edb15b09cd..07a093b1ce3 100755
--- a/testsuite/expect/test1.38
+++ b/testsuite/expect/test1.38
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.39 b/testsuite/expect/test1.39
index c66f3a26f6c..34885f0eda6 100755
--- a/testsuite/expect/test1.39
+++ b/testsuite/expect/test1.39
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.39.prog.c b/testsuite/expect/test1.39.prog.c
index 1b244876213..7c06b04c98c 100644
--- a/testsuite/expect/test1.39.prog.c
+++ b/testsuite/expect/test1.39.prog.c
@@ -22,7 +22,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdlib.h>
 
diff --git a/testsuite/expect/test1.4 b/testsuite/expect/test1.4
index 8c1a0eccc66..b8297109807 100755
--- a/testsuite/expect/test1.4
+++ b/testsuite/expect/test1.4
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.40 b/testsuite/expect/test1.40
index 5b6f370cba5..f79a43cde05 100755
--- a/testsuite/expect/test1.40
+++ b/testsuite/expect/test1.40
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.41 b/testsuite/expect/test1.41
index 6e030187839..7c5009bd9b8 100755
--- a/testsuite/expect/test1.41
+++ b/testsuite/expect/test1.41
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.42 b/testsuite/expect/test1.42
index 84ecc1b9361..b4299a02e3c 100755
--- a/testsuite/expect/test1.42
+++ b/testsuite/expect/test1.42
@@ -32,7 +32,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.43 b/testsuite/expect/test1.43
index dd54ec6591c..d9a4057f052 100755
--- a/testsuite/expect/test1.43
+++ b/testsuite/expect/test1.43
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.44 b/testsuite/expect/test1.44
index 4eac0028ff8..bb7024aca19 100755
--- a/testsuite/expect/test1.44
+++ b/testsuite/expect/test1.44
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.45 b/testsuite/expect/test1.45
index e8728197013..29698391079 100755
--- a/testsuite/expect/test1.45
+++ b/testsuite/expect/test1.45
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index 3f56fbc2025..e53a279732a 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.47 b/testsuite/expect/test1.47
index 709d3351a4e..103796be2e2 100755
--- a/testsuite/expect/test1.47
+++ b/testsuite/expect/test1.47
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.48 b/testsuite/expect/test1.48
index f29801248fb..16d283ed350 100755
--- a/testsuite/expect/test1.48
+++ b/testsuite/expect/test1.48
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.49 b/testsuite/expect/test1.49
index 65355e5fee2..7d52e49cd86 100755
--- a/testsuite/expect/test1.49
+++ b/testsuite/expect/test1.49
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.5 b/testsuite/expect/test1.5
index df7b6d565dc..4d03930aba2 100755
--- a/testsuite/expect/test1.5
+++ b/testsuite/expect/test1.5
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.50 b/testsuite/expect/test1.50
index 2f2116af4d4..fd4822c4a2b 100755
--- a/testsuite/expect/test1.50
+++ b/testsuite/expect/test1.50
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.51 b/testsuite/expect/test1.51
index 3b7763ec439..067734103f2 100755
--- a/testsuite/expect/test1.51
+++ b/testsuite/expect/test1.51
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index fb4ba5534a0..02f515b5a76 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.53 b/testsuite/expect/test1.53
index 3acec3f5743..3cbb4431acf 100755
--- a/testsuite/expect/test1.53
+++ b/testsuite/expect/test1.53
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.54 b/testsuite/expect/test1.54
index c5459511526..1f29b5dd2ee 100755
--- a/testsuite/expect/test1.54
+++ b/testsuite/expect/test1.54
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.55 b/testsuite/expect/test1.55
index 7079d5fdb76..45ce1a71e34 100755
--- a/testsuite/expect/test1.55
+++ b/testsuite/expect/test1.55
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.56 b/testsuite/expect/test1.56
index a0856771da3..be431f9b483 100755
--- a/testsuite/expect/test1.56
+++ b/testsuite/expect/test1.56
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index f9f01a45291..86ba387255c 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index f3c646aaf62..f8af7c61665 100755
--- a/testsuite/expect/test1.7
+++ b/testsuite/expect/test1.7
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.8 b/testsuite/expect/test1.8
index 6b6f27e77e0..72cd69845a7 100755
--- a/testsuite/expect/test1.8
+++ b/testsuite/expect/test1.8
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.80 b/testsuite/expect/test1.80
index c8d00851ba7..6248842a8a0 100755
--- a/testsuite/expect/test1.80
+++ b/testsuite/expect/test1.80
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index 666d5bd7952..b50a6868683 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.82 b/testsuite/expect/test1.82
index 53e4f448f9b..ff3cde551dd 100755
--- a/testsuite/expect/test1.82
+++ b/testsuite/expect/test1.82
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.83 b/testsuite/expect/test1.83
index 5a2ac639b88..b8ab57e857c 100755
--- a/testsuite/expect/test1.83
+++ b/testsuite/expect/test1.83
@@ -33,7 +33,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index cdc4bf9b25a..4316ef23ef1 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -33,7 +33,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.85 b/testsuite/expect/test1.85
index 075742a3f96..a22cde3baa1 100755
--- a/testsuite/expect/test1.85
+++ b/testsuite/expect/test1.85
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index 96ea964a72a..cbb4cf0ad53 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index e5c7d914cde..8b391693d5b 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 80c0a6ae001..21aa2310cdf 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.88.prog.c b/testsuite/expect/test1.88.prog.c
index 787dd2354a4..64938d1e41b 100644
--- a/testsuite/expect/test1.88.prog.c
+++ b/testsuite/expect/test1.88.prog.c
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index 6cc9f9d2b56..ae8c341011d 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.89.prog.c b/testsuite/expect/test1.89.prog.c
index b21e90f749e..8df477c98f1 100644
--- a/testsuite/expect/test1.89.prog.c
+++ b/testsuite/expect/test1.89.prog.c
@@ -23,7 +23,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #define _GNU_SOURCE
 #define __USE_GNU
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 471fac033af..e91341879e9 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index a53e90f9949..685c75a4d9c 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test1.90.prog.c b/testsuite/expect/test1.90.prog.c
index 0347527165e..e061156c4af 100644
--- a/testsuite/expect/test1.90.prog.c
+++ b/testsuite/expect/test1.90.prog.c
@@ -23,7 +23,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #define _GNU_SOURCE
 #include <numa.h>
diff --git a/testsuite/expect/test10.1 b/testsuite/expect/test10.1
index 2a78c3f96d5..2f04746f978 100755
--- a/testsuite/expect/test10.1
+++ b/testsuite/expect/test10.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.10 b/testsuite/expect/test10.10
index dc48c8631bb..5de4f84dc89 100755
--- a/testsuite/expect/test10.10
+++ b/testsuite/expect/test10.10
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.11 b/testsuite/expect/test10.11
index 873757f9c15..d5be6fa8b5a 100755
--- a/testsuite/expect/test10.11
+++ b/testsuite/expect/test10.11
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.12 b/testsuite/expect/test10.12
index 90b6c26f7af..3978a88b54e 100755
--- a/testsuite/expect/test10.12
+++ b/testsuite/expect/test10.12
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.13 b/testsuite/expect/test10.13
index 30550142bd6..4f279683b1b 100755
--- a/testsuite/expect/test10.13
+++ b/testsuite/expect/test10.13
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.2 b/testsuite/expect/test10.2
index 5513480d248..e6535748a50 100755
--- a/testsuite/expect/test10.2
+++ b/testsuite/expect/test10.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.3 b/testsuite/expect/test10.3
index a7d4cd7bf34..7d381fc51ca 100755
--- a/testsuite/expect/test10.3
+++ b/testsuite/expect/test10.3
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.4 b/testsuite/expect/test10.4
index 33407dd3ccb..5e882da1bd1 100755
--- a/testsuite/expect/test10.4
+++ b/testsuite/expect/test10.4
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.5 b/testsuite/expect/test10.5
index 8fe41895a8c..807a5e81da4 100755
--- a/testsuite/expect/test10.5
+++ b/testsuite/expect/test10.5
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.6 b/testsuite/expect/test10.6
index a37b4d2d869..def18af3e03 100755
--- a/testsuite/expect/test10.6
+++ b/testsuite/expect/test10.6
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.7 b/testsuite/expect/test10.7
index afd7b467a0e..079722214ad 100755
--- a/testsuite/expect/test10.7
+++ b/testsuite/expect/test10.7
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.8 b/testsuite/expect/test10.8
index c7940854540..d228ea84dfb 100755
--- a/testsuite/expect/test10.8
+++ b/testsuite/expect/test10.8
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test10.9 b/testsuite/expect/test10.9
index afcd9b03dbd..8e137b3ca2b 100755
--- a/testsuite/expect/test10.9
+++ b/testsuite/expect/test10.9
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test11.1 b/testsuite/expect/test11.1
index e73ac4cabb9..90ac310df03 100755
--- a/testsuite/expect/test11.1
+++ b/testsuite/expect/test11.1
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test11.2 b/testsuite/expect/test11.2
index fcae9bc9f93..375234a1fff 100755
--- a/testsuite/expect/test11.2
+++ b/testsuite/expect/test11.2
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test11.3 b/testsuite/expect/test11.3
index 572e54b413d..912a0fe98cd 100755
--- a/testsuite/expect/test11.3
+++ b/testsuite/expect/test11.3
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test11.4 b/testsuite/expect/test11.4
index 3bbcfbcf09b..bcaede59407 100755
--- a/testsuite/expect/test11.4
+++ b/testsuite/expect/test11.4
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 7af333db76a..83351f2cc38 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test11.7 b/testsuite/expect/test11.7
index fe008bcf088..89f38cdb3e2 100755
--- a/testsuite/expect/test11.7
+++ b/testsuite/expect/test11.7
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test12.1 b/testsuite/expect/test12.1
index 7ca502394b3..e0df915ee32 100755
--- a/testsuite/expect/test12.1
+++ b/testsuite/expect/test12.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index f9ed4788994..fdc73d59865 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test12.2.prog.c b/testsuite/expect/test12.2.prog.c
index ebcc5785351..b6c1a90f1b2 100644
--- a/testsuite/expect/test12.2.prog.c
+++ b/testsuite/expect/test12.2.prog.c
@@ -22,7 +22,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index f05363bd698..a4f418eb944 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index aaf6a80a010..416b3dc6efa 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index 8615882987f..cb28c6e75ab 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index b30e840eee1..e7c2024d759 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.4 b/testsuite/expect/test14.4
index ed2728713c7..81c6f836608 100755
--- a/testsuite/expect/test14.4
+++ b/testsuite/expect/test14.4
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.5 b/testsuite/expect/test14.5
index 0f2ae8d908b..344f62a23b2 100755
--- a/testsuite/expect/test14.5
+++ b/testsuite/expect/test14.5
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.6 b/testsuite/expect/test14.6
index 7493839f256..b78ce549ee3 100755
--- a/testsuite/expect/test14.6
+++ b/testsuite/expect/test14.6
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.7 b/testsuite/expect/test14.7
index 29ee35b8145..164d8e3f52c 100755
--- a/testsuite/expect/test14.7
+++ b/testsuite/expect/test14.7
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test14.8 b/testsuite/expect/test14.8
index 8bfd058b880..dd64f3e41c6 100755
--- a/testsuite/expect/test14.8
+++ b/testsuite/expect/test14.8
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.1 b/testsuite/expect/test2.1
index 07d8c2b446f..4a233510b31 100755
--- a/testsuite/expect/test2.1
+++ b/testsuite/expect/test2.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.10 b/testsuite/expect/test2.10
index d748fe51903..4e6c4c8632d 100755
--- a/testsuite/expect/test2.10
+++ b/testsuite/expect/test2.10
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.2 b/testsuite/expect/test2.2
index f1e5a2b271b..b650f3581c8 100755
--- a/testsuite/expect/test2.2
+++ b/testsuite/expect/test2.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.3 b/testsuite/expect/test2.3
index 56a2d25273c..3b4cbd39444 100755
--- a/testsuite/expect/test2.3
+++ b/testsuite/expect/test2.3
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.4 b/testsuite/expect/test2.4
index 460d6f714aa..7b097f37484 100755
--- a/testsuite/expect/test2.4
+++ b/testsuite/expect/test2.4
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.5 b/testsuite/expect/test2.5
index f560a478121..f37e4e1fa6b 100755
--- a/testsuite/expect/test2.5
+++ b/testsuite/expect/test2.5
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.6 b/testsuite/expect/test2.6
index 26fdaa8daa6..f36df2b3624 100755
--- a/testsuite/expect/test2.6
+++ b/testsuite/expect/test2.6
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index 7dae81f4a84..8dcf6d7a289 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index 24b4d17e9a5..cac2866cca5 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test2.9 b/testsuite/expect/test2.9
index e847435467d..224d1b422f9 100755
--- a/testsuite/expect/test2.9
+++ b/testsuite/expect/test2.9
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.1 b/testsuite/expect/test3.1
index b983de06017..1c349b2322a 100755
--- a/testsuite/expect/test3.1
+++ b/testsuite/expect/test3.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.2 b/testsuite/expect/test3.2
index 8472e0a1e8e..b9512e2aa58 100755
--- a/testsuite/expect/test3.2
+++ b/testsuite/expect/test3.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.3 b/testsuite/expect/test3.3
index e45caee431f..fc2f9a4f151 100755
--- a/testsuite/expect/test3.3
+++ b/testsuite/expect/test3.3
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index b71e94c8ad5..a417e1a99a7 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.5 b/testsuite/expect/test3.5
index e0a6018f27d..c0e64d8399a 100755
--- a/testsuite/expect/test3.5
+++ b/testsuite/expect/test3.5
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.6 b/testsuite/expect/test3.6
index 11f7a136b6f..22aeeef9115 100755
--- a/testsuite/expect/test3.6
+++ b/testsuite/expect/test3.6
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index ae32814c55a..abcc8627667 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test3.7.prog.c b/testsuite/expect/test3.7.prog.c
index 62ba21d0111..8a1c9e1d9a8 100644
--- a/testsuite/expect/test3.7.prog.c
+++ b/testsuite/expect/test3.7.prog.c
@@ -24,7 +24,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/testsuite/expect/test4.1 b/testsuite/expect/test4.1
index 5f31769178e..7fcde3270e7 100755
--- a/testsuite/expect/test4.1
+++ b/testsuite/expect/test4.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.10 b/testsuite/expect/test4.10
index 628a0ce21bd..8bfff7c16c3 100755
--- a/testsuite/expect/test4.10
+++ b/testsuite/expect/test4.10
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.11 b/testsuite/expect/test4.11
index dfcd975e3e3..7064fad24c3 100755
--- a/testsuite/expect/test4.11
+++ b/testsuite/expect/test4.11
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.2 b/testsuite/expect/test4.2
index 354f242eb0e..d990969c7c3 100755
--- a/testsuite/expect/test4.2
+++ b/testsuite/expect/test4.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.3 b/testsuite/expect/test4.3
index 2fe9087cf78..f28a56110d3 100755
--- a/testsuite/expect/test4.3
+++ b/testsuite/expect/test4.3
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.4 b/testsuite/expect/test4.4
index 7e8458441db..8f44d16a41f 100755
--- a/testsuite/expect/test4.4
+++ b/testsuite/expect/test4.4
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.5 b/testsuite/expect/test4.5
index 743c2402e7c..60081db1aa1 100755
--- a/testsuite/expect/test4.5
+++ b/testsuite/expect/test4.5
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.6 b/testsuite/expect/test4.6
index f0251961208..d91a2480516 100755
--- a/testsuite/expect/test4.6
+++ b/testsuite/expect/test4.6
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.7 b/testsuite/expect/test4.7
index c532861383a..3af5f3e8bb1 100755
--- a/testsuite/expect/test4.7
+++ b/testsuite/expect/test4.7
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.8 b/testsuite/expect/test4.8
index 8f2a84d4c00..121c39ea480 100755
--- a/testsuite/expect/test4.8
+++ b/testsuite/expect/test4.8
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test4.9 b/testsuite/expect/test4.9
index 04916a44bec..bcb0a48d43d 100755
--- a/testsuite/expect/test4.9
+++ b/testsuite/expect/test4.9
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.1 b/testsuite/expect/test5.1
index def7bfd569b..fa82e53f2e7 100755
--- a/testsuite/expect/test5.1
+++ b/testsuite/expect/test5.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.2 b/testsuite/expect/test5.2
index db4759bf6e0..3853a29fa03 100755
--- a/testsuite/expect/test5.2
+++ b/testsuite/expect/test5.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.3 b/testsuite/expect/test5.3
index 558f8a4f9ad..4662151712a 100755
--- a/testsuite/expect/test5.3
+++ b/testsuite/expect/test5.3
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index 9db626f6be0..fcf528a6802 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.5 b/testsuite/expect/test5.5
index aac356978f0..23a0e18c71b 100755
--- a/testsuite/expect/test5.5
+++ b/testsuite/expect/test5.5
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 3221213392d..444b7aa74c8 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -28,7 +28,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.7 b/testsuite/expect/test5.7
index 5bd6cebcf55..188bdc18058 100755
--- a/testsuite/expect/test5.7
+++ b/testsuite/expect/test5.7
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test5.8 b/testsuite/expect/test5.8
index 1e1a37ccad4..1662eb41fd5 100755
--- a/testsuite/expect/test5.8
+++ b/testsuite/expect/test5.8
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.1 b/testsuite/expect/test6.1
index bb9a3319059..d51fdf36133 100755
--- a/testsuite/expect/test6.1
+++ b/testsuite/expect/test6.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index de5d90fee34..c44ed04f2c3 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.11 b/testsuite/expect/test6.11
index 991947d1353..aa4d6d5642e 100755
--- a/testsuite/expect/test6.11
+++ b/testsuite/expect/test6.11
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index 74931e9c03b..97f1714ee2b 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.2 b/testsuite/expect/test6.2
index 00489d2f509..2e8be2464eb 100755
--- a/testsuite/expect/test6.2
+++ b/testsuite/expect/test6.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index ba61cd14ba5..b09fe384f20 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index e3e3a6f83ae..de9d5e1516f 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.5 b/testsuite/expect/test6.5
index 925eef2afd4..e8d43b55c0a 100755
--- a/testsuite/expect/test6.5
+++ b/testsuite/expect/test6.5
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.6 b/testsuite/expect/test6.6
index 27dc6a0d2eb..3bff7d58236 100755
--- a/testsuite/expect/test6.6
+++ b/testsuite/expect/test6.6
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index bef9a02a2fa..83e2219070a 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index b4caee4f66e..5d087e095a9 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index 26ba9058f0d..286a568c2b7 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index 33a806e646c..2258024e1bd 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test7.2 b/testsuite/expect/test7.2
index 3d39521a8c4..5350e9e6083 100755
--- a/testsuite/expect/test7.2
+++ b/testsuite/expect/test7.2
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test7.2.prog.c b/testsuite/expect/test7.2.prog.c
index a73c636b3fa..507a8fefdaa 100644
--- a/testsuite/expect/test7.2.prog.c
+++ b/testsuite/expect/test7.2.prog.c
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/testsuite/expect/test7.3 b/testsuite/expect/test7.3
index cc4db69e5f4..90c9b6c94ef 100755
--- a/testsuite/expect/test7.3
+++ b/testsuite/expect/test7.3
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test7.3.io.c b/testsuite/expect/test7.3.io.c
index 9f588891ac2..27780552203 100644
--- a/testsuite/expect/test7.3.io.c
+++ b/testsuite/expect/test7.3.io.c
@@ -24,7 +24,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <errno.h>
 #include <stdio.h>
diff --git a/testsuite/expect/test7.3.prog.c b/testsuite/expect/test7.3.prog.c
index 8814bdfe208..0762a7948b2 100644
--- a/testsuite/expect/test7.3.prog.c
+++ b/testsuite/expect/test7.3.prog.c
@@ -23,7 +23,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 #include <signal.h>
 #include <stdio.h>
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index 529ff8328a2..de921a4ce5e 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test7.4.prog.c b/testsuite/expect/test7.4.prog.c
index 88927e780da..a3656bafaa8 100644
--- a/testsuite/expect/test7.4.prog.c
+++ b/testsuite/expect/test7.4.prog.c
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/testsuite/expect/test8.1 b/testsuite/expect/test8.1
index 3f4660298ee..0aa288065a0 100755
--- a/testsuite/expect/test8.1
+++ b/testsuite/expect/test8.1
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test8.2 b/testsuite/expect/test8.2
index 2e01da1f6c2..70451d5d2a0 100755
--- a/testsuite/expect/test8.2
+++ b/testsuite/expect/test8.2
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test8.3 b/testsuite/expect/test8.3
index 907dcf5248d..85659c04446 100755
--- a/testsuite/expect/test8.3
+++ b/testsuite/expect/test8.3
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test8.4 b/testsuite/expect/test8.4
index a52fce671ae..dc1167976c5 100755
--- a/testsuite/expect/test8.4
+++ b/testsuite/expect/test8.4
@@ -31,7 +31,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test8.4.prog.c b/testsuite/expect/test8.4.prog.c
index 9a2ffd9c24a..64a0de0909a 100644
--- a/testsuite/expect/test8.4.prog.c
+++ b/testsuite/expect/test8.4.prog.c
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <stdio.h>
diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index 708c3943697..59ffe2073da 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index 57bbe7c9b05..05ed5beadc0 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index 3043416fba8..20ecdcf7207 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index 507308aaa1d..6d02fe7b8e3 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -33,7 +33,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5
index a4e0efe1a45..0faaa3d5ca4 100755
--- a/testsuite/expect/test9.5
+++ b/testsuite/expect/test9.5
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6
index adbf73b7347..26d8bd3fa2a 100755
--- a/testsuite/expect/test9.6
+++ b/testsuite/expect/test9.6
@@ -29,7 +29,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.7 b/testsuite/expect/test9.7
index bda321e22f7..3f1dfb4cf14 100755
--- a/testsuite/expect/test9.7
+++ b/testsuite/expect/test9.7
@@ -27,7 +27,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/test9.7.bash b/testsuite/expect/test9.7.bash
index 54c586b7201..25dfb8198ba 100755
--- a/testsuite/expect/test9.7.bash
+++ b/testsuite/expect/test9.7.bash
@@ -24,7 +24,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 if [ $# -gt 0 ]; then
 	exec1=$1
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index 01f4624e978..050de25854d 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -30,7 +30,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 source ./globals
 
diff --git a/testsuite/expect/usleep b/testsuite/expect/usleep
index 74be95c0bf3..70ce619afe6 100755
--- a/testsuite/expect/usleep
+++ b/testsuite/expect/usleep
@@ -24,7 +24,7 @@
 # 
 # You should have received a copy of the GNU General Public License along
 # with SLURM; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 ############################################################################
 #
 # Read command line options
diff --git a/testsuite/slurm_unit/api/manual/allocate-tst.c b/testsuite/slurm_unit/api/manual/allocate-tst.c
index 79fb2598e49..6996e42964b 100644
--- a/testsuite/slurm_unit/api/manual/allocate-tst.c
+++ b/testsuite/slurm_unit/api/manual/allocate-tst.c
@@ -21,7 +21,7 @@
  *  
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/cancel-tst.c b/testsuite/slurm_unit/api/manual/cancel-tst.c
index 2cd64fc4825..24cd3b37896 100644
--- a/testsuite/slurm_unit/api/manual/cancel-tst.c
+++ b/testsuite/slurm_unit/api/manual/cancel-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/complete-tst.c b/testsuite/slurm_unit/api/manual/complete-tst.c
index 1e30b3c0c1c..d9a94a2badc 100644
--- a/testsuite/slurm_unit/api/manual/complete-tst.c
+++ b/testsuite/slurm_unit/api/manual/complete-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/job_info-tst.c b/testsuite/slurm_unit/api/manual/job_info-tst.c
index 93afa0ec425..ce38cb6b3d6 100644
--- a/testsuite/slurm_unit/api/manual/job_info-tst.c
+++ b/testsuite/slurm_unit/api/manual/job_info-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 
diff --git a/testsuite/slurm_unit/api/manual/node_info-tst.c b/testsuite/slurm_unit/api/manual/node_info-tst.c
index 6342cec967c..4e121f0be10 100644
--- a/testsuite/slurm_unit/api/manual/node_info-tst.c
+++ b/testsuite/slurm_unit/api/manual/node_info-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/partition_info-tst.c b/testsuite/slurm_unit/api/manual/partition_info-tst.c
index ba701a163bc..d3341bd6409 100644
--- a/testsuite/slurm_unit/api/manual/partition_info-tst.c
+++ b/testsuite/slurm_unit/api/manual/partition_info-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/reconfigure-tst.c b/testsuite/slurm_unit/api/manual/reconfigure-tst.c
index 60fd237701c..9a1bdec472e 100644
--- a/testsuite/slurm_unit/api/manual/reconfigure-tst.c
+++ b/testsuite/slurm_unit/api/manual/reconfigure-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/submit-tst.c b/testsuite/slurm_unit/api/manual/submit-tst.c
index 61e8b4f88d7..fb4cfd8925a 100644
--- a/testsuite/slurm_unit/api/manual/submit-tst.c
+++ b/testsuite/slurm_unit/api/manual/submit-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
diff --git a/testsuite/slurm_unit/api/manual/update_config-tst.c b/testsuite/slurm_unit/api/manual/update_config-tst.c
index bb9418c9244..428f19edde6 100644
--- a/testsuite/slurm_unit/api/manual/update_config-tst.c
+++ b/testsuite/slurm_unit/api/manual/update_config-tst.c
@@ -21,7 +21,7 @@
  *
  *  You should have received a copy of the GNU General Public License along
  *  with SLURM; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
 \*****************************************************************************/
 
 #include <errno.h>
-- 
GitLab