diff --git a/include/about_dialog.h b/include/about_dialog.h
index 14093f646..7970daf54 100644
--- a/include/about_dialog.h
+++ b/include/about_dialog.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/arp_and_chords_tab_widget.h b/include/arp_and_chords_tab_widget.h
index bdd65a7e5..ff3b5ae25 100644
--- a/include/arp_and_chords_tab_widget.h
+++ b/include/arp_and_chords_tab_widget.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_alsa.h b/include/audio_alsa.h
index 0cab60874..fe3468010 100644
--- a/include/audio_alsa.h
+++ b/include/audio_alsa.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_device.h b/include/audio_device.h
index 0594661d2..aa9995c71 100644
--- a/include/audio_device.h
+++ b/include/audio_device.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_dummy.h b/include/audio_dummy.h
index 7c3a9ac24..92c664f80 100644
--- a/include/audio_dummy.h
+++ b/include/audio_dummy.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_file_device.h b/include/audio_file_device.h
index 06539e8ac..0f701b3f8 100644
--- a/include/audio_file_device.h
+++ b/include/audio_file_device.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_file_ogg.h b/include/audio_file_ogg.h
index 0ce4c67cc..ef88b6f8d 100644
--- a/include/audio_file_ogg.h
+++ b/include/audio_file_ogg.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_file_wave.h b/include/audio_file_wave.h
index e76be3ca2..7e832e1fa 100644
--- a/include/audio_file_wave.h
+++ b/include/audio_file_wave.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_jack.h b/include/audio_jack.h
index 2c57dfe9b..6ae03e77b 100644
--- a/include/audio_jack.h
+++ b/include/audio_jack.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_oss.h b/include/audio_oss.h
index 3c94bc0e7..a214d4345 100644
--- a/include/audio_oss.h
+++ b/include/audio_oss.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_port.h b/include/audio_port.h
index 6bea8d718..1d9be76fb 100644
--- a/include/audio_port.h
+++ b/include/audio_port.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_sample_recorder.h b/include/audio_sample_recorder.h
index 71405de84..27201e798 100644
--- a/include/audio_sample_recorder.h
+++ b/include/audio_sample_recorder.h
@@ -19,8 +19,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/audio_sdl.h b/include/audio_sdl.h
index addcef1f2..b707a589c 100644
--- a/include/audio_sdl.h
+++ b/include/audio_sdl.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/automatable_button.h b/include/automatable_button.h
index 42be93951..a0158c6cf 100755
--- a/include/automatable_button.h
+++ b/include/automatable_button.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/automatable_object.h b/include/automatable_object.h
index 7534486d2..6e3944366 100755
--- a/include/automatable_object.h
+++ b/include/automatable_object.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/automatable_slider.h b/include/automatable_slider.h
index 5776c9e8f..05e7db32d 100644
--- a/include/automatable_slider.h
+++ b/include/automatable_slider.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/automation_editor.h b/include/automation_editor.h
index 195be1a2d..8e4ac9040 100644
--- a/include/automation_editor.h
+++ b/include/automation_editor.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/automation_pattern.h b/include/automation_pattern.h
index 589be0abb..a379e9ce9 100644
--- a/include/automation_pattern.h
+++ b/include/automation_pattern.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/automation_track.h b/include/automation_track.h
index 854a564ed..1101abdd7 100644
--- a/include/automation_track.h
+++ b/include/automation_track.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/debug.h b/include/debug.h
index b111cc155..7e6f913ec 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/led_checkbox.h b/include/led_checkbox.h
index 26a695d75..33198450b 100644
--- a/include/led_checkbox.h
+++ b/include/led_checkbox.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/level_object.h b/include/level_object.h
index 8ba10e5be..524079f34 100644
--- a/include/level_object.h
+++ b/include/level_object.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/rename_dialog.h b/include/rename_dialog.h
index 929dbc0af..5d053e883 100644
--- a/include/rename_dialog.h
+++ b/include/rename_dialog.h
@@ -18,8 +18,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/setup_dialog.h b/include/setup_dialog.h
index fb0200853..234bdd2d4 100644
--- a/include/setup_dialog.h
+++ b/include/setup_dialog.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/templates.h b/include/templates.h
index f32438adb..81d46e097 100644
--- a/include/templates.h
+++ b/include/templates.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/tempo_sync_knob.h b/include/tempo_sync_knob.h
index 55c759d97..1947461d2 100644
--- a/include/tempo_sync_knob.h
+++ b/include/tempo_sync_knob.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/include/text_float.h b/include/text_float.h
index 60c974279..33dfb0bd6 100644
--- a/include/text_float.h
+++ b/include/text_float.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 
diff --git a/plugins/vibed/impulse_editor.h b/plugins/vibed/impulse_editor.h
index 365b10710..6e2a587fd 100644
--- a/plugins/vibed/impulse_editor.h
+++ b/plugins/vibed/impulse_editor.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU General Public
  * License along with this program (see COPYING); 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 Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
  *
  */
 #ifndef _IMPULSE_EDITOR_H