diff --git a/LICENSE b/LICENSE
index b1e3f5a..d12bef0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@
 		       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+     51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -485,7 +485,7 @@ convey the exclusion of warranty; and each file should have at least the
 
     You should have received a copy of the GNU Lesser General Public
     License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
diff --git a/demos/demo.py b/demos/demo.py
index cab1ae8..2f44e78 100755
--- a/demos/demo.py
+++ b/demos/demo.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 
 import base64
diff --git a/demos/demo_server.py b/demos/demo_server.py
index de27220..06d73b1 100644
--- a/demos/demo_server.py
+++ b/demos/demo_server.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 import base64
 from binascii import hexlify
diff --git a/demos/demo_sftp.py b/demos/demo_sftp.py
index 7586cc4..2a2c5a1 100755
--- a/demos/demo_sftp.py
+++ b/demos/demo_sftp.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 # based on code provided by raymond mosteller (thanks!)
 
diff --git a/demos/demo_simple.py b/demos/demo_simple.py
index cb67f7a..b2c3380 100755
--- a/demos/demo_simple.py
+++ b/demos/demo_simple.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 
 import base64
diff --git a/demos/forward.py b/demos/forward.py
index 87b4527..d974710 100644
--- a/demos/forward.py
+++ b/demos/forward.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Sample script showing how to do local port forwarding over ssh.
diff --git a/demos/interactive.py b/demos/interactive.py
index 1ecf3f3..969ab5c 100644
--- a/demos/interactive.py
+++ b/demos/interactive.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 
 import socket
diff --git a/demos/rforward.py b/demos/rforward.py
index f5c1c2f..741c28a 100755
--- a/demos/rforward.py
+++ b/demos/rforward.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Sample script showing how to do remote port forwarding over ssh.
diff --git a/setup.py b/setup.py
index bd12231..5fbb8c5 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 
 longdesc = '''
diff --git a/setup_helper.py b/setup_helper.py
index 9206aae..156ba66 100644
--- a/setup_helper.py
+++ b/setup_helper.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 # Note: Despite the copyright notice, this was submitted by John
 # Arbash Meinel.  Thanks John!
diff --git a/ssh/__init__.py b/ssh/__init__.py
index 5935d3c..9f8fce1 100644
--- a/ssh/__init__.py
+++ b/ssh/__init__.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 I{'ssh'} 
diff --git a/ssh/agent.py b/ssh/agent.py
index 08aceca..f8edf6f 100644
--- a/ssh/agent.py
+++ b/ssh/agent.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 SSH Agent interface for Unix clients.
diff --git a/ssh/auth_handler.py b/ssh/auth_handler.py
index 352b2b1..2bcdf70 100644
--- a/ssh/auth_handler.py
+++ b/ssh/auth_handler.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{AuthHandler}
diff --git a/ssh/ber.py b/ssh/ber.py
index acf7d8f..19b6545 100644
--- a/ssh/ber.py
+++ b/ssh/ber.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 
 import util
diff --git a/ssh/buffered_pipe.py b/ssh/buffered_pipe.py
index 6b92892..8178d38 100644
--- a/ssh/buffered_pipe.py
+++ b/ssh/buffered_pipe.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Attempt to generalize the "feeder" part of a Channel: an object which can be
diff --git a/ssh/channel.py b/ssh/channel.py
index bd6b1c8..fc1a33a 100644
--- a/ssh/channel.py
+++ b/ssh/channel.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Abstraction for an SSH2 channel.
diff --git a/ssh/client.py b/ssh/client.py
index 9e6317a..2fe862c 100644
--- a/ssh/client.py
+++ b/ssh/client.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{SSHClient}.
diff --git a/ssh/common.py b/ssh/common.py
index 4858200..463b743 100644
--- a/ssh/common.py
+++ b/ssh/common.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Common constants and global variables.
diff --git a/ssh/compress.py b/ssh/compress.py
index 0b5a425..f9d6995 100644
--- a/ssh/compress.py
+++ b/ssh/compress.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Compression implementations for a Transport.
diff --git a/ssh/config.py b/ssh/config.py
index 8c1451b..4198861 100644
--- a/ssh/config.py
+++ b/ssh/config.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{SSHConfig}.
diff --git a/ssh/dsskey.py b/ssh/dsskey.py
index b1b662c..9de0d67 100644
--- a/ssh/dsskey.py
+++ b/ssh/dsskey.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{DSSKey}
diff --git a/ssh/file.py b/ssh/file.py
index 1403726..52856a4 100644
--- a/ssh/file.py
+++ b/ssh/file.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 BufferedFile.
diff --git a/ssh/hostkeys.py b/ssh/hostkeys.py
index 6ee9fdc..acc646e 100644
--- a/ssh/hostkeys.py
+++ b/ssh/hostkeys.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{HostKeys}
diff --git a/ssh/kex_gex.py b/ssh/kex_gex.py
index 78dfb30..a8043d0 100644
--- a/ssh/kex_gex.py
+++ b/ssh/kex_gex.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Variant on L{KexGroup1 <ssh.kex_group1.KexGroup1>} where the prime "p" and
diff --git a/ssh/kex_group1.py b/ssh/kex_group1.py
index 9378a9b..aac81f2 100644
--- a/ssh/kex_group1.py
+++ b/ssh/kex_group1.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Standard SSH key exchange ("kex" if you wanna sound cool).  Diffie-Hellman of
diff --git a/ssh/logging22.py b/ssh/logging22.py
index 154d59d..9fe7d72 100644
--- a/ssh/logging22.py
+++ b/ssh/logging22.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Stub out logging on python < 2.3.
diff --git a/ssh/message.py b/ssh/message.py
index 24a06fd..50c227e 100644
--- a/ssh/message.py
+++ b/ssh/message.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Implementation of an SSH2 "message".
diff --git a/ssh/packet.py b/ssh/packet.py
index 47b721c..f8c3269 100644
--- a/ssh/packet.py
+++ b/ssh/packet.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Packetizer.
diff --git a/ssh/pipe.py b/ssh/pipe.py
index ccee94d..5586d1f 100644
--- a/ssh/pipe.py
+++ b/ssh/pipe.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Abstraction of a one-way pipe where the read end can be used in select().
diff --git a/ssh/pkey.py b/ssh/pkey.py
index ba0b158..ff650d1 100644
--- a/ssh/pkey.py
+++ b/ssh/pkey.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Common API for all public keys.
diff --git a/ssh/primes.py b/ssh/primes.py
index 18bff1a..dfeff9a 100644
--- a/ssh/primes.py
+++ b/ssh/primes.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Utility functions for dealing with primes.
diff --git a/ssh/resource.py b/ssh/resource.py
index 2bcf8d9..acf3a0d 100644
--- a/ssh/resource.py
+++ b/ssh/resource.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Resource manager.
diff --git a/ssh/rsakey.py b/ssh/rsakey.py
index bec9de7..133c44b 100644
--- a/ssh/rsakey.py
+++ b/ssh/rsakey.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{RSAKey}
diff --git a/ssh/server.py b/ssh/server.py
index 12d21d0..a6d8f2d 100644
--- a/ssh/server.py
+++ b/ssh/server.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{ServerInterface} is an interface to override for server support.
diff --git a/ssh/sftp.py b/ssh/sftp.py
index eb0b43f..9c156b7 100644
--- a/ssh/sftp.py
+++ b/ssh/sftp.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 import select
 import socket
diff --git a/ssh/sftp_attr.py b/ssh/sftp_attr.py
index 9433599..074ce82 100644
--- a/ssh/sftp_attr.py
+++ b/ssh/sftp_attr.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 import stat
 import time
diff --git a/ssh/sftp_client.py b/ssh/sftp_client.py
index 7d2a43e..3f4e358 100644
--- a/ssh/sftp_client.py
+++ b/ssh/sftp_client.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Client-mode SFTP support.
diff --git a/ssh/sftp_file.py b/ssh/sftp_file.py
index 218f7cb..3c9a73e 100644
--- a/ssh/sftp_file.py
+++ b/ssh/sftp_file.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{SFTPFile}
diff --git a/ssh/sftp_handle.py b/ssh/sftp_handle.py
index 8478736..95370f3 100644
--- a/ssh/sftp_handle.py
+++ b/ssh/sftp_handle.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Abstraction of an SFTP file handle (for server mode).
diff --git a/ssh/sftp_server.py b/ssh/sftp_server.py
index b521f3c..897b27c 100644
--- a/ssh/sftp_server.py
+++ b/ssh/sftp_server.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Server-mode SFTP support.
diff --git a/ssh/sftp_si.py b/ssh/sftp_si.py
index 21ec765..293d282 100644
--- a/ssh/sftp_si.py
+++ b/ssh/sftp_si.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{SFTPServerInterface} is an interface to override for SFTP server support.
diff --git a/ssh/ssh_exception.py b/ssh/ssh_exception.py
index 2f1e0c6..92ab717 100644
--- a/ssh/ssh_exception.py
+++ b/ssh/ssh_exception.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Exceptions defined by ssh.
diff --git a/ssh/transport.py b/ssh/transport.py
index 2afadec..cbf8b2e 100644
--- a/ssh/transport.py
+++ b/ssh/transport.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 L{Transport} handles the core SSH2 protocol.
diff --git a/ssh/util.py b/ssh/util.py
index 816d80d..1884765 100644
--- a/ssh/util.py
+++ b/ssh/util.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Useful functions used by the rest of ssh.
diff --git a/ssh/win_pageant.py b/ssh/win_pageant.py
index e66b9fb..2b5419d 100644
--- a/ssh/win_pageant.py
+++ b/ssh/win_pageant.py
@@ -15,7 +15,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Functions for communicating with Pageant, the basic windows ssh agent program.
diff --git a/test.py b/test.py
index a92f150..5676af9 100755
--- a/test.py
+++ b/test.py
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 do the unit tests!
diff --git a/tests/loop.py b/tests/loop.py
index ac48a87..0eac08a 100644
--- a/tests/loop.py
+++ b/tests/loop.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 ...
diff --git a/tests/stub_sftp.py b/tests/stub_sftp.py
index 172f33a..1310133 100644
--- a/tests/stub_sftp.py
+++ b/tests/stub_sftp.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 A stub SFTP server for loopback SFTP testing.
diff --git a/tests/test_auth.py b/tests/test_auth.py
index db4b7c5..1f34a88 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for authenticating over a Transport.
diff --git a/tests/test_buffered_pipe.py b/tests/test_buffered_pipe.py
index a656e3b..c0784ef 100644
--- a/tests/test_buffered_pipe.py
+++ b/tests/test_buffered_pipe.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for BufferedPipe.
diff --git a/tests/test_client.py b/tests/test_client.py
index 45e34ec..05a49c9 100644
--- a/tests/test_client.py
+++ b/tests/test_client.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for SSHClient.
diff --git a/tests/test_file.py b/tests/test_file.py
index 999a0f8..82a9ba5 100755
--- a/tests/test_file.py
+++ b/tests/test_file.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for the BufferedFile abstraction.
diff --git a/tests/test_hostkeys.py b/tests/test_hostkeys.py
index 7b9bbc7..4b5da09 100644
--- a/tests/test_hostkeys.py
+++ b/tests/test_hostkeys.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for HostKeys.
diff --git a/tests/test_kex.py b/tests/test_kex.py
index 4c46728..e239930 100644
--- a/tests/test_kex.py
+++ b/tests/test_kex.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for the key exchange protocols.
diff --git a/tests/test_message.py b/tests/test_message.py
index b6abd5c..ecde436 100644
--- a/tests/test_message.py
+++ b/tests/test_message.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for ssh protocol message blocks.
diff --git a/tests/test_packetizer.py b/tests/test_packetizer.py
index da23f7a..92cf89c 100644
--- a/tests/test_packetizer.py
+++ b/tests/test_packetizer.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for the ssh2 protocol in Transport.
diff --git a/tests/test_pkey.py b/tests/test_pkey.py
index 18bd1e1..f444a80 100644
--- a/tests/test_pkey.py
+++ b/tests/test_pkey.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for public/private key objects.
diff --git a/tests/test_sftp.py b/tests/test_sftp.py
index 752bc39..f1ca69c 100755
--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 some unit tests to make sure sftp works.
diff --git a/tests/test_sftp_big.py b/tests/test_sftp_big.py
index f1a5ce2..0baf2a8 100644
--- a/tests/test_sftp_big.py
+++ b/tests/test_sftp_big.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 some unit tests to make sure sftp works well with large files.
diff --git a/tests/test_transport.py b/tests/test_transport.py
index b25a23f..44da754 100644
--- a/tests/test_transport.py
+++ b/tests/test_transport.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for the ssh2 protocol in Transport.
diff --git a/tests/test_util.py b/tests/test_util.py
index b44aa0e..5cb114c 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public License
 # along with 'ssh'; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+# 51 Franklin Street, Suite 500, Boston, MA  02110-1335  USA.
 
 """
 Some unit tests for utility functions.