diff --git a/COPYING b/COPYING
index 147a2d7a1..b2ff8bf2a 100644
--- a/COPYING
+++ b/COPYING
@@ -14,5 +14,5 @@
 
  You should have received a copy of the GNU Lesser 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.
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301, USA.
diff --git a/bin/pitivi.in b/bin/pitivi.in
index bce256b70..ea00c5a03 100644
--- a/bin/pitivi.in
+++ b/bin/pitivi.in
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os
 import sys
diff --git a/docs/pitivi.1 b/docs/pitivi.1
index 17a692efb..45a9f6e55 100644
--- a/docs/pitivi.1
+++ b/docs/pitivi.1
@@ -12,7 +12,7 @@
 .\"
 .\"You should have received a copy of the GNU Lesser 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.
+.\"51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 .TH pitivi 1 "2010\-12\-08" "GNOME"
 .SH NAME
 pitivi \- Non-linear video editor
diff --git a/pitivi/action.py b/pitivi/action.py
index f29835a9a..a45dad2c7 100644
--- a/pitivi/action.py
+++ b/pitivi/action.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Pipeline actions
diff --git a/pitivi/actioner.py b/pitivi/actioner.py
index f23b69f9a..0482654f8 100644
--- a/pitivi/actioner.py
+++ b/pitivi/actioner.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Rendering helpers
diff --git a/pitivi/application.py b/pitivi/application.py
index e5a055dfc..844562407 100644
--- a/pitivi/application.py
+++ b/pitivi/application.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Main application
diff --git a/pitivi/check.py b/pitivi/check.py
index 8755ca58e..619367a11 100644
--- a/pitivi/check.py
+++ b/pitivi/check.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Runtime checks.
diff --git a/pitivi/configure.py.in b/pitivi/configure.py.in
index b39998c2a..e5da2f9f9 100644
--- a/pitivi/configure.py.in
+++ b/pitivi/configure.py.in
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 """
 Utilities for getting the location of various directories.
 Enables identical use for installed and uninstalled versions.
diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
index 473d1c5e8..f0b5ae1a5 100644
--- a/pitivi/discoverer.py
+++ b/pitivi/discoverer.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Discover file multimedia information.
diff --git a/pitivi/effects.py b/pitivi/effects.py
index 941b02aae..8361e0458 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Effects global handling
diff --git a/pitivi/elements/arraysink.py b/pitivi/elements/arraysink.py
index 5a1b8f3b9..eed349cc8 100644
--- a/pitivi/elements/arraysink.py
+++ b/pitivi/elements/arraysink.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 """
 Stores audio samples in an array for plotting waveforms
 """
diff --git a/pitivi/elements/mixer.py b/pitivi/elements/mixer.py
index 92028dcfb..8c4dedecf 100644
--- a/pitivi/elements/mixer.py
+++ b/pitivi/elements/mixer.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Audio and Video mixers
diff --git a/pitivi/elements/singledecodebin.py b/pitivi/elements/singledecodebin.py
index ddfd3b12a..69a163c62 100644
--- a/pitivi/elements/singledecodebin.py
+++ b/pitivi/elements/singledecodebin.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Single-stream queue-less decodebin
diff --git a/pitivi/elements/thumbnailsink.py b/pitivi/elements/thumbnailsink.py
index 3fd0ac968..98a460ef9 100644
--- a/pitivi/elements/thumbnailsink.py
+++ b/pitivi/elements/thumbnailsink.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 """
 GdkPixbuf thumbnail sink
 """
diff --git a/pitivi/elements/videofade.py b/pitivi/elements/videofade.py
index 44cef1e2e..413e4766a 100644
--- a/pitivi/elements/videofade.py
+++ b/pitivi/elements/videofade.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Simple video fade element
diff --git a/pitivi/encode.py b/pitivi/encode.py
index 6bff7ac63..021af996a 100644
--- a/pitivi/encode.py
+++ b/pitivi/encode.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Encoding-related utilities and classes
diff --git a/pitivi/factories/base.py b/pitivi/factories/base.py
index 2e564c2fe..1f19bf9c9 100644
--- a/pitivi/factories/base.py
+++ b/pitivi/factories/base.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os.path
 from urllib import unquote
diff --git a/pitivi/factories/file.py b/pitivi/factories/file.py
index fca5f2f1f..b6668a787 100644
--- a/pitivi/factories/file.py
+++ b/pitivi/factories/file.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 import os
diff --git a/pitivi/factories/operation.py b/pitivi/factories/operation.py
index 8e1ce8457..8e4b34f99 100644
--- a/pitivi/factories/operation.py
+++ b/pitivi/factories/operation.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 from pitivi.factories.base import OperationFactory
diff --git a/pitivi/factories/test.py b/pitivi/factories/test.py
index 361a8914d..2557fe7b8 100644
--- a/pitivi/factories/test.py
+++ b/pitivi/factories/test.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 from pitivi.factories.base import SourceFactory
diff --git a/pitivi/factories/timeline.py b/pitivi/factories/timeline.py
index ee0001023..5f6ffa642 100644
--- a/pitivi/factories/timeline.py
+++ b/pitivi/factories/timeline.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 import gst
diff --git a/pitivi/formatters/__init__.py b/pitivi/formatters/__init__.py
index d6587590a..6f6d5cf07 100644
--- a/pitivi/formatters/__init__.py
+++ b/pitivi/formatters/__init__.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Project store/load support
diff --git a/pitivi/formatters/base.py b/pitivi/formatters/base.py
index 23a8a49f2..27422fa5f 100644
--- a/pitivi/formatters/base.py
+++ b/pitivi/formatters/base.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Base Formatter classes
diff --git a/pitivi/formatters/etree.py b/pitivi/formatters/etree.py
index c48f915e4..bfcbc22f5 100644
--- a/pitivi/formatters/etree.py
+++ b/pitivi/formatters/etree.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 gobject.threads_init()
diff --git a/pitivi/formatters/format.py b/pitivi/formatters/format.py
index 5bf591d31..3cbb865df 100644
--- a/pitivi/formatters/format.py
+++ b/pitivi/formatters/format.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 High-level tools for using Formatters
diff --git a/pitivi/formatters/playlist.py b/pitivi/formatters/playlist.py
index 52778d422..8570bf4d8 100644
--- a/pitivi/formatters/playlist.py
+++ b/pitivi/formatters/playlist.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os.path
 import ConfigParser
diff --git a/pitivi/instance.py b/pitivi/instance.py
index 85b2c5797..a784c1250 100644
--- a/pitivi/instance.py
+++ b/pitivi/instance.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Current PiTiVi instance module
diff --git a/pitivi/log/loggable.py b/pitivi/log/loggable.py
index 6dde3f272..5f9559da3 100644
--- a/pitivi/log/loggable.py
+++ b/pitivi/log/loggable.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from pitivi.log.log import _canShortcutLogging, doLog, ERROR
 from pitivi.log import log
diff --git a/pitivi/pipeline.py b/pitivi/pipeline.py
index e1b029961..1e07e89f9 100644
--- a/pitivi/pipeline.py
+++ b/pitivi/pipeline.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 High-level pipelines
diff --git a/pitivi/pitivigstutils.py b/pitivi/pitivigstutils.py
index a15c1445b..ac59732f4 100644
--- a/pitivi/pitivigstutils.py
+++ b/pitivi/pitivigstutils.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Additional methods for gst object to simplify code in pitivi.
diff --git a/pitivi/plugincore.py b/pitivi/plugincore.py
index 1af44757b..bd0825cea 100644
--- a/pitivi/plugincore.py
+++ b/pitivi/plugincore.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from zope.interface import Interface, Attribute
 
diff --git a/pitivi/pluginmanager.py b/pitivi/pluginmanager.py
index c47ed78a7..38faa674f 100644
--- a/pitivi/pluginmanager.py
+++ b/pitivi/pluginmanager.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Plugin Manager
diff --git a/pitivi/plumber.py b/pitivi/plumber.py
index 6181315bd..99ce5edd6 100644
--- a/pitivi/plumber.py
+++ b/pitivi/plumber.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Convenience functions for creating the output media sinks
diff --git a/pitivi/project.py b/pitivi/project.py
index ff2e4c546..3cf1f4484 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Project class
diff --git a/pitivi/projectmanager.py b/pitivi/projectmanager.py
index 11bf3de72..e3498baba 100644
--- a/pitivi/projectmanager.py
+++ b/pitivi/projectmanager.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from gettext import gettext as _
 import gobject
diff --git a/pitivi/settings.py b/pitivi/settings.py
index d441ebc93..50ca97944 100644
--- a/pitivi/settings.py
+++ b/pitivi/settings.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Settings
diff --git a/pitivi/signalgroup.py b/pitivi/signalgroup.py
index abc26e8bc..9188bab39 100644
--- a/pitivi/signalgroup.py
+++ b/pitivi/signalgroup.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 A group of signals, which can be disconnected easily.
diff --git a/pitivi/signalinterface.py b/pitivi/signalinterface.py
index 62b9ab902..9692f8b78 100644
--- a/pitivi/signalinterface.py
+++ b/pitivi/signalinterface.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # FIXME/IDEA : Add a decorator to easily add signals (ex: @signal(name="mysignal"))
 # FIXME/IDEA : Add a function to quickly define signals (a-la pygobject gsignals)
diff --git a/pitivi/sourcelist.py b/pitivi/sourcelist.py
index e1a8c7637..344db047d 100644
--- a/pitivi/sourcelist.py
+++ b/pitivi/sourcelist.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Handles the list of source for a project
diff --git a/pitivi/sourcelist_undo.py b/pitivi/sourcelist_undo.py
index 891cf8beb..c2bc2b657 100644
--- a/pitivi/sourcelist_undo.py
+++ b/pitivi/sourcelist_undo.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from pitivi.undo import UndoableAction
 
diff --git a/pitivi/stream.py b/pitivi/stream.py
index 6ced245ec..a8e315314 100644
--- a/pitivi/stream.py
+++ b/pitivi/stream.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Multimedia stream, used for definition of media streams
diff --git a/pitivi/threads.py b/pitivi/threads.py
index 13274b05a..b1d1de24c 100644
--- a/pitivi/threads.py
+++ b/pitivi/threads.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 """
 Threading support
 """
diff --git a/pitivi/thumbnailcache.py b/pitivi/thumbnailcache.py
index a7e3fcc24..43afaf3a4 100644
--- a/pitivi/thumbnailcache.py
+++ b/pitivi/thumbnailcache.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Dictionary-Like object for caching of thumbnails.
diff --git a/pitivi/timeline/gap.py b/pitivi/timeline/gap.py
index c8b27b956..72c3e2da9 100644
--- a/pitivi/timeline/gap.py
+++ b/pitivi/timeline/gap.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from pitivi.utils import infinity
 
diff --git a/pitivi/timeline/timeline.py b/pitivi/timeline/timeline.py
index 629918d23..5bd21c5f7 100644
--- a/pitivi/timeline/timeline.py
+++ b/pitivi/timeline/timeline.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from bisect import bisect_left
 
diff --git a/pitivi/timeline/timeline_undo.py b/pitivi/timeline/timeline_undo.py
index 5f5477137..5b63e229e 100644
--- a/pitivi/timeline/timeline_undo.py
+++ b/pitivi/timeline/timeline_undo.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 
diff --git a/pitivi/timeline/track.py b/pitivi/timeline/track.py
index c9eec4cbf..a6ab93cfe 100644
--- a/pitivi/timeline/track.py
+++ b/pitivi/timeline/track.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 import gobject
diff --git a/pitivi/ui/audiofxlist.py b/pitivi/ui/audiofxlist.py
index 1982b474c..c4d96438c 100644
--- a/pitivi/ui/audiofxlist.py
+++ b/pitivi/ui/audiofxlist.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gtk
 import pango
diff --git a/pitivi/ui/basetabs.py b/pitivi/ui/basetabs.py
index 25b4910d6..9acdd354b 100644
--- a/pitivi/ui/basetabs.py
+++ b/pitivi/ui/basetabs.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gtk
 from pitivi.ui.common import SPACING
diff --git a/pitivi/ui/clipproperties.py b/pitivi/ui/clipproperties.py
index a284f6435..ccd734805 100644
--- a/pitivi/ui/clipproperties.py
+++ b/pitivi/ui/clipproperties.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Class handling the midle pane
diff --git a/pitivi/ui/controller.py b/pitivi/ui/controller.py
index 57bbb55e8..8092bbd53 100644
--- a/pitivi/ui/controller.py
+++ b/pitivi/ui/controller.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gtk.gdk
 from pitivi.receiver import receiver, handler
diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
index ec2c19a44..bb62a5b46 100644
--- a/pitivi/ui/curve.py
+++ b/pitivi/ui/curve.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Custom canvas item for track object keyframe curves."""
diff --git a/pitivi/ui/defaultpropertyeditor.py b/pitivi/ui/defaultpropertyeditor.py
index 4040a752b..f1b902499 100644
--- a/pitivi/ui/defaultpropertyeditor.py
+++ b/pitivi/ui/defaultpropertyeditor.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Editor for aribtrary properties of timeline objects
diff --git a/pitivi/ui/dnd.py b/pitivi/ui/dnd.py
index 3b57a8cec..c508a2c88 100644
--- a/pitivi/ui/dnd.py
+++ b/pitivi/ui/dnd.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Drag and drop constants
diff --git a/pitivi/ui/dynamic.py b/pitivi/ui/dynamic.py
index 21f692a9e..d593e29bd 100644
--- a/pitivi/ui/dynamic.py
+++ b/pitivi/ui/dynamic.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 A collection of helper classes and routines for dynamically creating user
diff --git a/pitivi/ui/effectlist.py b/pitivi/ui/effectlist.py
index 1c87d1896..308d75918 100644
--- a/pitivi/ui/effectlist.py
+++ b/pitivi/ui/effectlist.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gtk
 import pango
diff --git a/pitivi/ui/effectsconfiguration.py b/pitivi/ui/effectsconfiguration.py
index b002b87c0..aa69e042d 100644
--- a/pitivi/ui/effectsconfiguration.py
+++ b/pitivi/ui/effectsconfiguration.py
@@ -15,8 +15,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 import gtk
diff --git a/pitivi/ui/encodingdialog.py b/pitivi/ui/encodingdialog.py
index 8cd80d168..2dfbccc6f 100644
--- a/pitivi/ui/encodingdialog.py
+++ b/pitivi/ui/encodingdialog.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Encoding dialog
diff --git a/pitivi/ui/encodingprogress.py b/pitivi/ui/encodingprogress.py
index 8cce0bc5d..f33003bee 100644
--- a/pitivi/ui/encodingprogress.py
+++ b/pitivi/ui/encodingprogress.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Encoding dialog
diff --git a/pitivi/ui/filelisterrordialog.py b/pitivi/ui/filelisterrordialog.py
index 997424c4c..caeb9c4a3 100644
--- a/pitivi/ui/filelisterrordialog.py
+++ b/pitivi/ui/filelisterrordialog.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Dialog box listing files which had errors, and the reasons.
diff --git a/pitivi/ui/gstwidget.py b/pitivi/ui/gstwidget.py
index 7b0917b7b..d5d3401b7 100644
--- a/pitivi/ui/gstwidget.py
+++ b/pitivi/ui/gstwidget.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Widget for gstreamer element properties viewing/setting
diff --git a/pitivi/ui/mainwindow.py b/pitivi/ui/mainwindow.py
index 5c4519f4c..db34312e4 100644
--- a/pitivi/ui/mainwindow.py
+++ b/pitivi/ui/mainwindow.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Main GTK+ window
diff --git a/pitivi/ui/pathwalker.py b/pitivi/ui/pathwalker.py
index 6d604438b..9de61a2d6 100644
--- a/pitivi/ui/pathwalker.py
+++ b/pitivi/ui/pathwalker.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os
 import threading
diff --git a/pitivi/ui/pluginmanagerdialog.py b/pitivi/ui/pluginmanagerdialog.py
index eeb0e1a06..81c24e17f 100644
--- a/pitivi/ui/pluginmanagerdialog.py
+++ b/pitivi/ui/pluginmanagerdialog.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os
 import gtk
diff --git a/pitivi/ui/prefs.py b/pitivi/ui/prefs.py
index ea1a454c7..aee79700e 100644
--- a/pitivi/ui/prefs.py
+++ b/pitivi/ui/prefs.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Dialog box for user preferences.
diff --git a/pitivi/ui/preset.py b/pitivi/ui/preset.py
index 626d3b239..52520b7a7 100644
--- a/pitivi/ui/preset.py
+++ b/pitivi/ui/preset.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from pitivi.settings import xdg_data_home
 from ConfigParser import SafeConfigParser
diff --git a/pitivi/ui/preview.py b/pitivi/ui/preview.py
index 0b2b65eae..23d13487f 100644
--- a/pitivi/ui/preview.py
+++ b/pitivi/ui/preview.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Custom canvas item for timeline object previews. This code is just a thin
diff --git a/pitivi/ui/previewer.py b/pitivi/ui/previewer.py
index 21f327d5f..143d8e24e 100644
--- a/pitivi/ui/previewer.py
+++ b/pitivi/ui/previewer.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Utility tools and classes for easy generation of previews
diff --git a/pitivi/ui/projectsettings.py b/pitivi/ui/projectsettings.py
index 4e3fae9d5..c6f201275 100644
--- a/pitivi/ui/projectsettings.py
+++ b/pitivi/ui/projectsettings.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Dialog box for project settings
diff --git a/pitivi/ui/propertyeditor.py b/pitivi/ui/propertyeditor.py
index 556e71fb0..e6d55dbcf 100644
--- a/pitivi/ui/propertyeditor.py
+++ b/pitivi/ui/propertyeditor.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Editor for aribtrary properties of timeline objects
diff --git a/pitivi/ui/ripple_update_group.py b/pitivi/ui/ripple_update_group.py
index 5cb7602c6..fc0742497 100644
--- a/pitivi/ui/ripple_update_group.py
+++ b/pitivi/ui/ripple_update_group.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 
 class RippleUpdateGroup(object):
diff --git a/pitivi/ui/ruler.py b/pitivi/ui/ruler.py
index 72de79d4b..488f5a53b 100644
--- a/pitivi/ui/ruler.py
+++ b/pitivi/ui/ruler.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Widget for the complex view ruler
diff --git a/pitivi/ui/sourcelist.py b/pitivi/ui/sourcelist.py
index 3c3b1405b..79569b417 100644
--- a/pitivi/ui/sourcelist.py
+++ b/pitivi/ui/sourcelist.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 import gst
diff --git a/pitivi/ui/timeline.py b/pitivi/ui/timeline.py
index a1a560368..c75ccf0ab 100644
--- a/pitivi/ui/timeline.py
+++ b/pitivi/ui/timeline.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Timeline widgets for the complex view
diff --git a/pitivi/ui/timelinecanvas.py b/pitivi/ui/timelinecanvas.py
index cbd874b23..62d5cd6ba 100644
--- a/pitivi/ui/timelinecanvas.py
+++ b/pitivi/ui/timelinecanvas.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gtk
 import goocanvas
diff --git a/pitivi/ui/videofxlist.py b/pitivi/ui/videofxlist.py
index c24f7944c..d6e270f2f 100644
--- a/pitivi/ui/videofxlist.py
+++ b/pitivi/ui/videofxlist.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Video effects list widget
diff --git a/pitivi/ui/viewer.py b/pitivi/ui/viewer.py
index 9287741ba..72c62d3e7 100644
--- a/pitivi/ui/viewer.py
+++ b/pitivi/ui/viewer.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import platform
 import gobject
diff --git a/pitivi/ui/zoominterface.py b/pitivi/ui/zoominterface.py
index 047185521..4adf4f7a9 100644
--- a/pitivi/ui/zoominterface.py
+++ b/pitivi/ui/zoominterface.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Interface for managing tranformation between timeline timestamps and UI
diff --git a/pitivi/undo.py b/pitivi/undo.py
index c2efc605c..e3e643171 100644
--- a/pitivi/undo.py
+++ b/pitivi/undo.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from pitivi.signalinterface import Signallable
 from pitivi.log.loggable import Loggable
diff --git a/pitivi/utils.py b/pitivi/utils.py
index 697fb7007..92599f0ad 100644
--- a/pitivi/utils.py
+++ b/pitivi/utils.py
@@ -18,8 +18,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 # set of utility functions
 
diff --git a/tests/test_action.py b/tests/test_action.py
index f3cd6ca4f..f5fefea7e 100644
--- a/tests/test_action.py
+++ b/tests/test_action.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import time
 import common
diff --git a/tests/test_alpha_passthrough.py b/tests/test_alpha_passthrough.py
index c07257661..5d0b3346b 100644
--- a/tests/test_alpha_passthrough.py
+++ b/tests/test_alpha_passthrough.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 
diff --git a/tests/test_common.py b/tests/test_common.py
index 0706f745d..49fda52a3 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import common
 from unittest import main
diff --git a/tests/test_discoverer.py b/tests/test_discoverer.py
index 1865aa2c1..df7efe530 100644
--- a/tests/test_discoverer.py
+++ b/tests/test_discoverer.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 gobject.threads_init()
diff --git a/tests/test_encode.py b/tests/test_encode.py
index 612f382cf..365363421 100644
--- a/tests/test_encode.py
+++ b/tests/test_encode.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 from unittest import main
diff --git a/tests/test_etree_formatter.py b/tests/test_etree_formatter.py
index a10d1e29e..b07b48fd0 100644
--- a/tests/test_etree_formatter.py
+++ b/tests/test_etree_formatter.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 import gst
diff --git a/tests/test_factories_base.py b/tests/test_factories_base.py
index 485cad888..e44708928 100644
--- a/tests/test_factories_base.py
+++ b/tests/test_factories_base.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 
diff --git a/tests/test_factories_file.py b/tests/test_factories_file.py
index f01ccd3df..78a242dac 100644
--- a/tests/test_factories_file.py
+++ b/tests/test_factories_file.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gst
 from common import TestCase
diff --git a/tests/test_factories_operation.py b/tests/test_factories_operation.py
index 0de343d2f..39c163179 100644
--- a/tests/test_factories_operation.py
+++ b/tests/test_factories_operation.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 # This program 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 3, or (at your option)
diff --git a/tests/test_gap.py b/tests/test_gap.py
index 5b32ca370..45919aa13 100644
--- a/tests/test_gap.py
+++ b/tests/test_gap.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 23d486b04..9718cb753 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """Test pitivi core objects at the API level, simulating the UI input for
 QA scenarios """
diff --git a/tests/test_pipeline.py b/tests/test_pipeline.py
index 6a17b6852..d56458503 100644
--- a/tests/test_pipeline.py
+++ b/tests/test_pipeline.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 gobject.threads_init()
diff --git a/tests/test_pipeline_action.py b/tests/test_pipeline_action.py
index ac709eac7..1d1748c11 100644
--- a/tests/test_pipeline_action.py
+++ b/tests/test_pipeline_action.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 """
 Tests for interaction between action and pipeline
diff --git a/tests/test_projectmanager.py b/tests/test_projectmanager.py
index f6dda5df5..cafdaddff 100644
--- a/tests/test_projectmanager.py
+++ b/tests/test_projectmanager.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 
diff --git a/tests/test_seeker.py b/tests/test_seeker.py
index e0bfce69b..219640648 100644
--- a/tests/test_seeker.py
+++ b/tests/test_seeker.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 from pitivi.utils import Seeker
diff --git a/tests/test_sourcelist.py b/tests/test_sourcelist.py
index b128047f5..079679e85 100644
--- a/tests/test_sourcelist.py
+++ b/tests/test_sourcelist.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 from pitivi.sourcelist import SourceList, SourceListError
diff --git a/tests/test_still_image.py b/tests/test_still_image.py
index 756025c42..329c5aa8a 100644
--- a/tests/test_still_image.py
+++ b/tests/test_still_image.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import os.path
 from unittest import TestCase
diff --git a/tests/test_stream.py b/tests/test_stream.py
index 91982b9ed..772dbb9a2 100644
--- a/tests/test_stream.py
+++ b/tests/test_stream.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from common import TestCase
 from pitivi.stream import AudioStream, VideoStream, match_stream, \
diff --git a/tests/test_timeline.py b/tests/test_timeline.py
index f9ef98ad2..2a4e0ce42 100644
--- a/tests/test_timeline.py
+++ b/tests/test_timeline.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import pygst
 pygst.require("0.10")
diff --git a/tests/test_timeline_factory.py b/tests/test_timeline_factory.py
index 47fbdf684..d111e58c6 100644
--- a/tests/test_timeline_factory.py
+++ b/tests/test_timeline_factory.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 import gobject
 gobject.threads_init()
diff --git a/tests/test_timeline_undo.py b/tests/test_timeline_undo.py
index 3370bf649..0f8be4c91 100644
--- a/tests/test_timeline_undo.py
+++ b/tests/test_timeline_undo.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 
diff --git a/tests/test_track.py b/tests/test_track.py
index a9e4470c4..bcce770d9 100644
--- a/tests/test_track.py
+++ b/tests/test_track.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from common import TestCase
 import gst
diff --git a/tests/test_transitions.py b/tests/test_transitions.py
index faf437a2c..727a6efed 100644
--- a/tests/test_transitions.py
+++ b/tests/test_transitions.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from common import TestCase
 import gst
diff --git a/tests/test_undo.py b/tests/test_undo.py
index c786ea174..12d53f431 100644
--- a/tests/test_undo.py
+++ b/tests/test_undo.py
@@ -16,8 +16,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 829f628d2..1aedd18bf 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -17,8 +17,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from unittest import TestCase
 
diff --git a/win32/setup.py b/win32/setup.py
index 98a8650f7..4db30e55a 100644
--- a/win32/setup.py
+++ b/win32/setup.py
@@ -15,8 +15,8 @@
 #
 # You should have received a copy of the GNU Lesser 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.
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 from distutils.core import setup
 import py2exe