diff --git a/COPYING b/COPYING
index 9a3c44afc1..d4e8cec112 100644
--- a/COPYING
+++ b/COPYING
@@ -10,7 +10,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     The GNU General Public License version 2 is included below for your reference.
 
@@ -19,7 +19,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, 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.
 
@@ -322,7 +322,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., 675 Mass Ave, Cambridge, MA 02139, 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/ChangeLog b/ChangeLog
index 32cddf448a..7478fbbab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-11-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* COPYING: update FSF address.
+
 2006-09-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.ac: begin the 1.4.4svn work.
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 309fe33367..212dee30b1 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* ControlAboutlyx.C (getCopyright): update dates
+	(getDisclaimer): update FSF address.
+
 2006-10-26  Enrico Forestieri  <forenr@tlc.unipr.it>
 
 	* ControlMath.[Ch]: (dispatchBigDelim): new, deal with fixed size
diff --git a/src/frontends/controllers/ControlAboutlyx.C b/src/frontends/controllers/ControlAboutlyx.C
index c4b9b4c292..d6b22530e5 100644
--- a/src/frontends/controllers/ControlAboutlyx.C
+++ b/src/frontends/controllers/ControlAboutlyx.C
@@ -63,7 +63,7 @@ void ControlAboutlyx::getCredits(ostream & ss) const
 
 string const ControlAboutlyx::getCopyright() const
 {
-	return _("LyX is Copyright (C) 1995 by Matthias Ettrich,\n1995-2001 LyX Team");
+	return _("LyX is Copyright (C) 1995 by Matthias Ettrich,\n1995-2006 LyX Team");
 }
 
 
@@ -75,7 +75,7 @@ string const ControlAboutlyx::getLicense() const
 
 string const ControlAboutlyx::getDisclaimer() const
 {
-	return _("LyX 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.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.");
+	return _("LyX 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.\nSee the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.");
 }