diff --git a/COPYING b/COPYING
index b411c8b4fe..4814f7477e 100644
--- a/COPYING
+++ b/COPYING
@@ -306,8 +306,8 @@ 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/judge/test_solution.sh b/judge/test_solution.sh
index 0e2f39ecd1..4c1180312d 100755
--- a/judge/test_solution.sh
+++ b/judge/test_solution.sh
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 
 # Usage: $0 <source> <lang> <testdata.in> <testdata.out> <timelimit> <tmpdir>
diff --git a/lib/lib.database.php b/lib/lib.database.php
index 06b34773d9..ccd6b27aa6 100644
--- a/lib/lib.database.php
+++ b/lib/lib.database.php
@@ -17,8 +17,8 @@
 FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License along with
-this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place, Suite 330, Boston, MA 02111-1307 USA
+this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 /******************************************************************************
 *    Initialisation                                                           *
diff --git a/submit/submit.cc b/submit/submit.cc
index c3a1cc0414..f02ab46d06 100644
--- a/submit/submit.cc
+++ b/submit/submit.cc
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
  */
 
diff --git a/submit/submitdaemon.cc b/submit/submitdaemon.cc
index f8da2f2790..67d8181eeb 100644
--- a/submit/submitdaemon.cc
+++ b/submit/submitdaemon.cc
@@ -18,7 +18,7 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
  */