diff --git a/history/gen_graph.sh b/history/gen_graph.sh
index b052528eef4..1136764cc54 100755
--- a/history/gen_graph.sh
+++ b/history/gen_graph.sh
@@ -24,7 +24,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.
 #
 ##############################################################################
 
diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py
index 8231c84dc36..ba5122eae54 100644
--- a/openerp/report/render/rml2html/rml2html.py
+++ b/openerp/report/render/rml2html/rml2html.py
@@ -16,7 +16,7 @@
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-13017  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017  USA
 #
 ##############################################################################
 
diff --git a/openerp/report/render/rml2html/utils.py b/openerp/report/render/rml2html/utils.py
index 8c180d398f9..3bedcff074d 100644
--- a/openerp/report/render/rml2html/utils.py
+++ b/openerp/report/render/rml2html/utils.py
@@ -16,7 +16,7 @@
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-13017  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017  USA
 #
 ##############################################################################
 
diff --git a/openerp/report/render/rml2pdf/utils.py b/openerp/report/render/rml2pdf/utils.py
index bc3aa06135a..bdf19d3cf77 100644
--- a/openerp/report/render/rml2pdf/utils.py
+++ b/openerp/report/render/rml2pdf/utils.py
@@ -16,7 +16,7 @@
 #
 # 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-13017  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-13017  USA
 #
 ##############################################################################
 
diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py
index 6134f75f93e..4c7e925b0d1 100644
--- a/openerp/service/http_server.py
+++ b/openerp/service/http_server.py
@@ -23,7 +23,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.
 ###############################################################################
 
 #.apidoc title: HTTP and XML-RPC Server
diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py
index 2ce6d3fa09d..7bbf8c74739 100644
--- a/openerp/service/websrv_lib.py
+++ b/openerp/service/websrv_lib.py
@@ -21,7 +21,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.
 ###############################################################################
 
 #.apidoc title: HTTP Layer library (websrv_lib)
diff --git a/setup.nsi b/setup.nsi
index 653a8798bb2..4316928917f 100644
--- a/setup.nsi
+++ b/setup.nsi
@@ -21,7 +21,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.
 #####################################################################################
 
 !include 'MUI2.nsh'