[galeon] Updated FSF's address

[Daniel Mustieles García <dmustieles src gnome org>]

commit 80892069f8ef07979336dfded291afe14108c1a2
Author: Daniel Mustieles <daniel mustieles gmail com>
Date:   Thu Jan 23 12:58:48 2014 +0100

    Updated FSF's address

 bookmarks/bookmarks-add-dialog.c                  |    3 +--
 bookmarks/bookmarks-add-dialog.h                  |    3 +--
 bookmarks/bookmarks-alias-placeholder-tb-widget.c |    3 +--
 bookmarks/bookmarks-alias-placeholder-tb-widget.h |    3 +--
 bookmarks/bookmarks-clipboard.c                   |    3 +--
 bookmarks/bookmarks-clipboard.h                   |    3 +--
 bookmarks/bookmarks-context-menu-several.c        |    3 +--
 bookmarks/bookmarks-context-menu-several.h        |    3 +--
 bookmarks/bookmarks-context-menu.c                |    3 +--
 bookmarks/bookmarks-context-menu.h                |    3 +--
 bookmarks/bookmarks-dnd.c                         |    3 +--
 bookmarks/bookmarks-dnd.h                         |    3 +--
 bookmarks/bookmarks-editor-dockable.c             |    3 +--
 bookmarks/bookmarks-editor-dockable.h             |    3 +--
 bookmarks/bookmarks-editor.c                      |    3 +--
 bookmarks/bookmarks-editor.h                      |    3 +--
 bookmarks/bookmarks-epiphany.c                    |    3 +--
 bookmarks/bookmarks-epiphany.h                    |    3 +--
 bookmarks/bookmarks-export-druid-konqueror.c      |    3 +--
 bookmarks/bookmarks-export-druid-konqueror.h      |    3 +--
 bookmarks/bookmarks-export-druid-mozilla.c        |    3 +--
 bookmarks/bookmarks-export-druid-mozilla.h        |    3 +--
 bookmarks/bookmarks-export-druid-netscape.c       |    3 +--
 bookmarks/bookmarks-export-druid-netscape.h       |    3 +--
 bookmarks/bookmarks-export-druid.c                |    3 +--
 bookmarks/bookmarks-export-druid.h                |    3 +--
 bookmarks/bookmarks-folder-tb-widget.c            |    3 +--
 bookmarks/bookmarks-folder-tb-widget.h            |    3 +--
 bookmarks/bookmarks-gtk-menu-item.c               |    3 +--
 bookmarks/bookmarks-gtk-menu-item.h               |    3 +--
 bookmarks/bookmarks-gtk-menu.c                    |    3 +--
 bookmarks/bookmarks-gtk-menu.h                    |    3 +--
 bookmarks/bookmarks-gtk-toolbar-set.c             |    3 +--
 bookmarks/bookmarks-gtk-toolbar-set.h             |    3 +--
 bookmarks/bookmarks-gtk-toolbar.c                 |    3 +--
 bookmarks/bookmarks-gtk-toolbar.h                 |    3 +--
 bookmarks/bookmarks-icon-provider.c               |    3 +--
 bookmarks/bookmarks-icon-provider.h               |    3 +--
 bookmarks/bookmarks-import-druid-epiphany.c       |    3 +--
 bookmarks/bookmarks-import-druid-epiphany.h       |    3 +--
 bookmarks/bookmarks-import-druid-konqueror.c      |    3 +--
 bookmarks/bookmarks-import-druid-konqueror.h      |    3 +--
 bookmarks/bookmarks-import-druid-mozilla.c        |    3 +--
 bookmarks/bookmarks-import-druid-mozilla.h        |    3 +--
 bookmarks/bookmarks-import-druid-netscape.c       |    3 +--
 bookmarks/bookmarks-import-druid-netscape.h       |    3 +--
 bookmarks/bookmarks-import-druid.c                |    3 +--
 bookmarks/bookmarks-import-druid.h                |    3 +--
 bookmarks/bookmarks-io.c                          |    3 +--
 bookmarks/bookmarks-io.h                          |    3 +--
 bookmarks/bookmarks-iterator.c                    |    3 +--
 bookmarks/bookmarks-iterator.h                    |    3 +--
 bookmarks/bookmarks-location-source.c             |    3 +--
 bookmarks/bookmarks-location-source.h             |    3 +--
 bookmarks/bookmarks-mozilla.c                     |    3 +--
 bookmarks/bookmarks-mozilla.h                     |    3 +--
 bookmarks/bookmarks-netscape-mozilla.c            |    3 +--
 bookmarks/bookmarks-netscape-mozilla.h            |    3 +--
 bookmarks/bookmarks-netscape.c                    |    3 +--
 bookmarks/bookmarks-netscape.h                    |    3 +--
 bookmarks/bookmarks-separator-tb-widget.c         |    3 +--
 bookmarks/bookmarks-separator-tb-widget.h         |    3 +--
 bookmarks/bookmarks-single-editor-small.c         |    3 +--
 bookmarks/bookmarks-single-editor-small.h         |    3 +--
 bookmarks/bookmarks-single-editor.c               |    3 +--
 bookmarks/bookmarks-single-editor.h               |    3 +--
 bookmarks/bookmarks-site-tb-widget.c              |    3 +--
 bookmarks/bookmarks-site-tb-widget.h              |    3 +--
 bookmarks/bookmarks-smart-site-tb-widget.c        |    3 +--
 bookmarks/bookmarks-smart-site-tb-widget.h        |    3 +--
 bookmarks/bookmarks-tb-widget.c                   |    3 +--
 bookmarks/bookmarks-tb-widget.h                   |    3 +--
 bookmarks/bookmarks-toolbar-widgets.c             |    3 +--
 bookmarks/bookmarks-toolbar-widgets.h             |    3 +--
 bookmarks/bookmarks-tree-model.c                  |    3 +--
 bookmarks/bookmarks-tree-model.h                  |    3 +--
 bookmarks/bookmarks-tree-view.c                   |    3 +--
 bookmarks/bookmarks-tree-view.h                   |    3 +--
 bookmarks/bookmarks-util.c                        |    3 +--
 bookmarks/bookmarks-util.h                        |    3 +--
 bookmarks/bookmarks-widgets-private.h             |    3 +--
 bookmarks/bookmarks.c                             |    3 +--
 bookmarks/bookmarks.h                             |    3 +--
 bookmarks/testbookmarks.c                         |    3 +--
 bookmarks/xbel.c                                  |    3 +--
 bookmarks/xbel.h                                  |    3 +--
 embed/downloader-view.c                           |    3 +--
 embed/downloader-view.h                           |    3 +--
 embed/galeon-embed-dialog.c                       |    3 +--
 embed/galeon-embed-dialog.h                       |    3 +--
 embed/galeon-embed-event.c                        |    3 +--
 embed/galeon-embed-event.h                        |    3 +--
 embed/galeon-embed-find.c                         |    3 +--
 embed/galeon-embed-find.h                         |    3 +--
 embed/galeon-embed-helper-list.c                  |    3 +--
 embed/galeon-embed-helper-list.h                  |    3 +--
 embed/galeon-embed-persist.c                      |    3 +--
 embed/galeon-embed-persist.h                      |    3 +--
 embed/galeon-embed-shell.c                        |    3 +--
 embed/galeon-embed-shell.h                        |    3 +--
 embed/galeon-embed-types.h                        |    3 +--
 embed/galeon-embed-utils.c                        |    3 +--
 embed/galeon-embed-utils.h                        |    3 +--
 embed/galeon-embed.c                              |    3 +--
 embed/galeon-embed.h                              |    3 +--
 embed/galeon-encodings.c                          |    3 +--
 embed/galeon-encodings.h                          |    3 +--
 embed/global-history.c                            |    3 +--
 embed/global-history.h                            |    3 +--
 embed/js-console.c                                |    3 +--
 embed/js-console.h                                |    3 +--
 embed/print-dialog.c                              |    3 +--
 embed/print-dialog.h                              |    3 +--
 gtkhtml/gtkhtml-embed-persist.c                   |    3 +--
 gtkhtml/gtkhtml-embed-persist.h                   |    3 +--
 gtkhtml/gtkhtml-embed-shell.c                     |    3 +--
 gtkhtml/gtkhtml-embed-shell.h                     |    3 +--
 gtkhtml/gtkhtml-embed.c                           |    3 +--
 gtkhtml/gtkhtml-embed.h                           |    3 +--
 libegg/dock/egg-dock-box.c                        |    4 +---
 libegg/dock/egg-dock-box.h                        |    4 +---
 libegg/dock/egg-dock-item.c                       |    4 +---
 libegg/dock/egg-dock-item.h                       |    4 +---
 libegg/dock/egg-dock-layout.c                     |    4 +---
 libegg/dock/egg-dock-layout.h                     |    4 +---
 libegg/dock/egg-dock-master.c                     |    4 +---
 libegg/dock/egg-dock-master.h                     |    4 +---
 libegg/dock/egg-dock-notebook.c                   |    4 +---
 libegg/dock/egg-dock-notebook.h                   |    4 +---
 libegg/dock/egg-dock-object.c                     |    4 +---
 libegg/dock/egg-dock-object.h                     |    4 +---
 libegg/dock/egg-dock-paned.c                      |    4 +---
 libegg/dock/egg-dock-paned.h                      |    4 +---
 libegg/dock/egg-dock-placeholder.c                |    4 +---
 libegg/dock/egg-dock-placeholder.h                |    4 +---
 libegg/dock/egg-dock-tablabel.c                   |    4 +---
 libegg/dock/egg-dock-tablabel.h                   |    4 +---
 libegg/dock/egg-dock.c                            |    4 +---
 libegg/dock/egg-dock.h                            |    4 +---
 libegg/egg-editable-toolbar.c                     |    3 +--
 libegg/egg-editable-toolbar.h                     |    3 +--
 libegg/egg-recent-item.c                          |    3 +--
 libegg/egg-recent-model.c                         |    3 +--
 libegg/egg-toolbar-editor.c                       |    3 +--
 libegg/egg-toolbar-editor.h                       |    3 +--
 libegg/egg-toolbars-model.c                       |    3 +--
 libegg/egg-toolbars-model.h                       |    3 +--
 mozilla/AutoJSContextStack.cpp                    |    3 +--
 mozilla/AutoJSContextStack.h                      |    3 +--
 mozilla/ContentHandler.cpp                        |    3 +--
 mozilla/ContentHandler.h                          |    3 +--
 mozilla/CookieObserver.cpp                        |    3 +--
 mozilla/CookieObserver.h                          |    3 +--
 mozilla/EphyDirectoryProvider.cpp                 |    3 +--
 mozilla/EphyDirectoryProvider.h                   |    3 +--
 mozilla/EphyPromptService.cpp                     |    3 +--
 mozilla/EphyPromptService.h                       |    3 +--
 mozilla/EventContext.cpp                          |    3 +--
 mozilla/EventContext.h                            |    3 +--
 mozilla/ExternalProtocolService.cpp               |    3 +--
 mozilla/ExternalProtocolService.h                 |    3 +--
 mozilla/FilePicker.cpp                            |    3 +--
 mozilla/FilePicker.h                              |    3 +--
 mozilla/GaleonAboutModule.cpp                     |    3 +--
 mozilla/GaleonAboutModule.h                       |    3 +--
 mozilla/GaleonFind.cpp                            |    3 +--
 mozilla/GaleonFind.h                              |    3 +--
 mozilla/GaleonJS.cpp                              |    3 +--
 mozilla/GaleonJS.h                                |    3 +--
 mozilla/GaleonUtils.cpp                           |    3 +--
 mozilla/GaleonUtils.h                             |    3 +--
 mozilla/GaleonWrapper.cpp                         |    3 +--
 mozilla/GaleonWrapper.h                           |    3 +--
 mozilla/GlobalHistory.cpp                         |    3 +--
 mozilla/GlobalHistory.h                           |    3 +--
 mozilla/GtkNSSClientAuthDialogs.cpp               |    3 +--
 mozilla/GtkNSSDialogs.cpp                         |    3 +--
 mozilla/GtkNSSKeyPairDialogs.cpp                  |    3 +--
 mozilla/GulString.h                               |    3 +--
 mozilla/JSConsoleListener.cpp                     |    3 +--
 mozilla/JSConsoleListener.h                       |    3 +--
 mozilla/JSConsoleService.cpp                      |    3 +--
 mozilla/JSConsoleService.h                        |    3 +--
 mozilla/MozRegisterComponents.cpp                 |    3 +--
 mozilla/MozRegisterComponents.h                   |    3 +--
 mozilla/MozillaPrivate.cpp                        |    3 +--
 mozilla/MozillaPrivate.h                          |    3 +--
 mozilla/MyportalProtocolHandler.cpp               |    3 +--
 mozilla/MyportalProtocolHandler.h                 |    3 +--
 mozilla/PrintProgressListener.cpp                 |    3 +--
 mozilla/PrintProgressListener.h                   |    3 +--
 mozilla/ProgressListener.cpp                      |    3 +--
 mozilla/ProgressListener.h                        |    3 +--
 mozilla/SideBarProxy.cpp                          |    3 +--
 mozilla/SideBarProxy.h                            |    3 +--
 mozilla/mozilla-embed-find.cpp                    |    3 +--
 mozilla/mozilla-embed-find.h                      |    3 +--
 mozilla/mozilla-embed-persist.cpp                 |    3 +--
 mozilla/mozilla-embed-persist.h                   |    3 +--
 mozilla/mozilla-embed-shell.cpp                   |    3 +--
 mozilla/mozilla-embed-shell.h                     |    3 +--
 mozilla/mozilla-embed.cpp                         |    3 +--
 mozilla/mozilla-embed.h                           |    3 +--
 mozilla/mozilla-encodings.c                       |    3 +--
 mozilla/mozilla-encodings.h                       |    3 +--
 mozilla/mozilla-i18n.c                            |    3 +--
 mozilla/mozilla-i18n.h                            |    3 +--
 mozilla/mozilla-notifiers.cpp                     |    3 +--
 mozilla/mozilla-notifiers.h                       |    3 +--
 mozilla/mozilla-prefs.cpp                         |    3 +--
 mozilla/mozilla-prefs.h                           |    3 +--
 src/galeon-action-favicon.c                       |    3 +--
 src/galeon-action-favicon.h                       |    3 +--
 src/galeon-action-go.c                            |    3 +--
 src/galeon-action-go.h                            |    3 +--
 src/galeon-action-home.c                          |    3 +--
 src/galeon-action-home.h                          |    3 +--
 src/galeon-action-location.c                      |    3 +--
 src/galeon-action-location.h                      |    3 +--
 src/galeon-action-navigation.c                    |    3 +--
 src/galeon-action-navigation.h                    |    3 +--
 src/galeon-action-new.c                           |    3 +--
 src/galeon-action-new.h                           |    3 +--
 src/galeon-action-refresh.c                       |    3 +--
 src/galeon-action-refresh.h                       |    3 +--
 src/galeon-action-spinner.c                       |    3 +--
 src/galeon-action-spinner.h                       |    3 +--
 src/galeon-action-stop.c                          |    3 +--
 src/galeon-action-stop.h                          |    3 +--
 src/galeon-action-zoom.c                          |    3 +--
 src/galeon-action-zoom.h                          |    3 +--
 src/galeon-action.c                               |    3 +--
 src/galeon-action.h                               |    3 +--
 src/galeon-bookmarks-icon-provider.c              |    3 +--
 src/galeon-bookmarks-icon-provider.h              |    3 +--
 src/galeon-css-menu.c                             |    3 +--
 src/galeon-css-menu.h                             |    3 +--
 src/galeon-embed-autoscroller.c                   |    3 +--
 src/galeon-embed-autoscroller.h                   |    3 +--
 src/galeon-embed-favicon.c                        |    3 +--
 src/galeon-embed-favicon.h                        |    3 +--
 src/galeon-embed-manual-scroller.c                |    3 +--
 src/galeon-embed-manual-scroller.h                |    3 +--
 src/galeon-encoding-dialog.c                      |    3 +--
 src/galeon-encoding-dialog.h                      |    3 +--
 src/galeon-encoding-menu.c                        |    3 +--
 src/galeon-encoding-menu.h                        |    3 +--
 src/galeon-favicon-action.c                       |    3 +--
 src/galeon-favicon-action.h                       |    3 +--
 src/galeon-favicon-cache.c                        |    3 +--
 src/galeon-favicon-cache.h                        |    3 +--
 src/galeon-favicon.c                              |    3 +--
 src/galeon-favicon.h                              |    3 +--
 src/galeon-main.c                                 |    3 +--
 src/galeon-popup.c                                |    3 +--
 src/galeon-popup.h                                |    3 +--
 src/galeon-recent-history-menu.c                  |    3 +--
 src/galeon-recent-history-menu.h                  |    3 +--
 src/galeon-session.c                              |    3 +--
 src/galeon-session.h                              |    3 +--
 src/galeon-shell.c                                |    3 +--
 src/galeon-shell.h                                |    3 +--
 src/galeon-sidebar-embed.c                        |    3 +--
 src/galeon-sidebar-embed.h                        |    3 +--
 src/galeon-sidebars.c                             |    3 +--
 src/galeon-sidebars.h                             |    3 +--
 src/galeon-simple-window.c                        |    3 +--
 src/galeon-simple-window.h                        |    3 +--
 src/galeon-tab-menu.c                             |    3 +--
 src/galeon-tab-menu.h                             |    3 +--
 src/galeon-tab.c                                  |    3 +--
 src/galeon-tab.h                                  |    3 +--
 src/galeon-window-bookmark-activated-proxy.c      |    3 +--
 src/galeon-window-bookmark-activated-proxy.h      |    3 +--
 src/galeon-window-menu.c                          |    3 +--
 src/galeon-window-menu.h                          |    3 +--
 src/galeon-window.c                               |    3 +--
 src/galeon-window.h                               |    3 +--
 src/history-dialog.c                              |    3 +--
 src/history-dialog.h                              |    3 +--
 src/migrate.c                                     |    3 +--
 src/migrate.h                                     |    3 +--
 src/page-info-dialog.c                            |    3 +--
 src/page-info-dialog.h                            |    3 +--
 src/pdm-dialog.c                                  |    3 +--
 src/pdm-dialog.h                                  |    3 +--
 src/popup-commands.c                              |    3 +--
 src/popup-commands.h                              |    3 +--
 src/ppview-toolbar.c                              |    3 +--
 src/ppview-toolbar.h                              |    3 +--
 src/statusbar.c                                   |    3 +--
 src/statusbar.h                                   |    3 +--
 src/window-commands.c                             |    3 +--
 src/window-commands.h                             |    3 +--
 src/window-recent-history.c                       |    3 +--
 src/window-recent-history.h                       |    3 +--
 utils/eel-gconf-extensions.c                      |    3 +--
 utils/eel-gconf-extensions.h                      |    3 +--
 utils/galeon-auto-bookmarks-source.c              |    3 +--
 utils/galeon-auto-bookmarks-source.h              |    3 +--
 utils/galeon-autocompletion-source.c              |    3 +--
 utils/galeon-autocompletion-source.h              |    3 +--
 utils/galeon-autocompletion-window.c              |    3 +--
 utils/galeon-autocompletion-window.h              |    3 +--
 utils/galeon-autocompletion.c                     |    3 +--
 utils/galeon-autocompletion.h                     |    3 +--
 utils/galeon-debug.c                              |    3 +--
 utils/galeon-debug.h                              |    3 +--
 utils/galeon-dialog.c                             |    3 +--
 utils/galeon-dialog.h                             |    3 +--
 utils/galeon-dnd.c                                |    3 +--
 utils/galeon-dnd.h                                |    3 +--
 utils/galeon-sidebar.c                            |    3 +--
 utils/galeon-sidebar.h                            |    3 +--
 utils/gul-download.c                              |    3 +--
 utils/gul-download.h                              |    3 +--
 utils/gul-ellipsizing-label.c                     |    3 +--
 utils/gul-ellipsizing-label.h                     |    3 +--
 utils/gul-file-chooser.c                          |    3 +--
 utils/gul-file-chooser.h                          |    3 +--
 utils/gul-file-preview.c                          |    3 +--
 utils/gul-file-preview.h                          |    3 +--
 utils/gul-filesystem-autocompletion.c             |    3 +--
 utils/gul-filesystem-autocompletion.h             |    3 +--
 utils/gul-general.c                               |    3 +--
 utils/gul-general.h                               |    3 +--
 utils/gul-gestures.c                              |    3 +--
 utils/gul-gestures.h                              |    3 +--
 utils/gul-glade.c                                 |    3 +--
 utils/gul-glade.h                                 |    3 +--
 utils/gul-gui.c                                   |    3 +--
 utils/gul-gui.h                                   |    3 +--
 utils/gul-iso-codes.c                             |    3 +--
 utils/gul-iso-codes.h                             |    3 +--
 utils/gul-notebook.c                              |    3 +--
 utils/gul-notebook.h                              |    3 +--
 utils/gul-prefs-utils.c                           |    3 +--
 utils/gul-prefs-utils.h                           |    3 +--
 utils/gul-state.c                                 |    3 +--
 utils/gul-state.h                                 |    3 +--
 utils/gul-string.c                                |    3 +--
 utils/gul-string.h                                |    3 +--
 utils/gul-toolbutton.c                            |    3 +--
 utils/gul-toolbutton.h                            |    3 +--
 utils/gul-x11.c                                   |    3 +--
 utils/gul-x11.h                                   |    3 +--
 utils/location-entry.c                            |    3 +--
 utils/location-entry.h                            |    3 +--
 utils/pixbuf-cache.c                              |    3 +--
 utils/pixbuf-cache.h                              |    3 +--
 350 files changed, 350 insertions(+), 720 deletions(-)
---
diff --git a/bookmarks/bookmarks-add-dialog.c b/bookmarks/bookmarks-add-dialog.c
index 6562b78..1c101d9 100644
--- a/bookmarks/bookmarks-add-dialog.c
+++ b/bookmarks/bookmarks-add-dialog.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/bookmarks/bookmarks-add-dialog.h b/bookmarks/bookmarks-add-dialog.h
index 9199f41..6fd307a 100644
--- a/bookmarks/bookmarks-add-dialog.h
+++ b/bookmarks/bookmarks-add-dialog.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef BOOKMARKS_ADD_DIALOG_H
diff --git a/bookmarks/bookmarks-alias-placeholder-tb-widget.c 
b/bookmarks/bookmarks-alias-placeholder-tb-widget.c
index 21c36a5..4b1cd03 100644
--- a/bookmarks/bookmarks-alias-placeholder-tb-widget.c
+++ b/bookmarks/bookmarks-alias-placeholder-tb-widget.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-alias-placeholder-tb-widget.h 
b/bookmarks/bookmarks-alias-placeholder-tb-widget.h
index b943a77..8f0eb8e 100644
--- a/bookmarks/bookmarks-alias-placeholder-tb-widget.h
+++ b/bookmarks/bookmarks-alias-placeholder-tb-widget.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_alias_placeholder_tb_widget_h
diff --git a/bookmarks/bookmarks-clipboard.c b/bookmarks/bookmarks-clipboard.c
index 37b7d31..b88c3b1 100644
--- a/bookmarks/bookmarks-clipboard.c
+++ b/bookmarks/bookmarks-clipboard.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-clipboard.h b/bookmarks/bookmarks-clipboard.h
index ed3523f..2bbed89 100644
--- a/bookmarks/bookmarks-clipboard.h
+++ b/bookmarks/bookmarks-clipboard.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_clipboard_h
diff --git a/bookmarks/bookmarks-context-menu-several.c b/bookmarks/bookmarks-context-menu-several.c
index ade3ce6..3d1a4c4 100644
--- a/bookmarks/bookmarks-context-menu-several.c
+++ b/bookmarks/bookmarks-context-menu-several.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-context-menu-several.h b/bookmarks/bookmarks-context-menu-several.h
index 098aa01..a6410b1 100644
--- a/bookmarks/bookmarks-context-menu-several.h
+++ b/bookmarks/bookmarks-context-menu-several.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_context_menu_several_h
diff --git a/bookmarks/bookmarks-context-menu.c b/bookmarks/bookmarks-context-menu.c
index 4ed05a6..67ec4c7 100644
--- a/bookmarks/bookmarks-context-menu.c
+++ b/bookmarks/bookmarks-context-menu.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-context-menu.h b/bookmarks/bookmarks-context-menu.h
index f75f40d..190df85 100644
--- a/bookmarks/bookmarks-context-menu.h
+++ b/bookmarks/bookmarks-context-menu.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_context_menu_h
diff --git a/bookmarks/bookmarks-dnd.c b/bookmarks/bookmarks-dnd.c
index cad2fea..6af70e6 100644
--- a/bookmarks/bookmarks-dnd.c
+++ b/bookmarks/bookmarks-dnd.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-dnd.h b/bookmarks/bookmarks-dnd.h
index df11ced..11bb976 100644
--- a/bookmarks/bookmarks-dnd.h
+++ b/bookmarks/bookmarks-dnd.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_dnd_h
diff --git a/bookmarks/bookmarks-editor-dockable.c b/bookmarks/bookmarks-editor-dockable.c
index 09fd3a2..35be233 100644
--- a/bookmarks/bookmarks-editor-dockable.c
+++ b/bookmarks/bookmarks-editor-dockable.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-editor-dockable.h b/bookmarks/bookmarks-editor-dockable.h
index 34b60b5..6175c02 100644
--- a/bookmarks/bookmarks-editor-dockable.h
+++ b/bookmarks/bookmarks-editor-dockable.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_editor_dockable_h
diff --git a/bookmarks/bookmarks-editor.c b/bookmarks/bookmarks-editor.c
index f941499..4734b1c 100644
--- a/bookmarks/bookmarks-editor.c
+++ b/bookmarks/bookmarks-editor.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-editor.h b/bookmarks/bookmarks-editor.h
index 81c16ad..5769896 100644
--- a/bookmarks/bookmarks-editor.h
+++ b/bookmarks/bookmarks-editor.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_editor_h
diff --git a/bookmarks/bookmarks-epiphany.c b/bookmarks/bookmarks-epiphany.c
index 2512b7e..988a8e5 100644
--- a/bookmarks/bookmarks-epiphany.c
+++ b/bookmarks/bookmarks-epiphany.c
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bookmarks/bookmarks-epiphany.h b/bookmarks/bookmarks-epiphany.h
index accdc91..24246be 100644
--- a/bookmarks/bookmarks-epiphany.h
+++ b/bookmarks/bookmarks-epiphany.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bookmarks/bookmarks-export-druid-konqueror.c b/bookmarks/bookmarks-export-druid-konqueror.c
index 59cf79d..5ecaef9 100644
--- a/bookmarks/bookmarks-export-druid-konqueror.c
+++ b/bookmarks/bookmarks-export-druid-konqueror.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-export-druid-konqueror.h b/bookmarks/bookmarks-export-druid-konqueror.h
index 81bab32..fe72577 100644
--- a/bookmarks/bookmarks-export-druid-konqueror.h
+++ b/bookmarks/bookmarks-export-druid-konqueror.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_export_druid_konqueror_h
diff --git a/bookmarks/bookmarks-export-druid-mozilla.c b/bookmarks/bookmarks-export-druid-mozilla.c
index 839c52f..ba97b83 100644
--- a/bookmarks/bookmarks-export-druid-mozilla.c
+++ b/bookmarks/bookmarks-export-druid-mozilla.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-export-druid-mozilla.h b/bookmarks/bookmarks-export-druid-mozilla.h
index f79341f..7c09a20 100644
--- a/bookmarks/bookmarks-export-druid-mozilla.h
+++ b/bookmarks/bookmarks-export-druid-mozilla.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_export_druid_mozilla_h
diff --git a/bookmarks/bookmarks-export-druid-netscape.c b/bookmarks/bookmarks-export-druid-netscape.c
index 86ed794..46d8b30 100644
--- a/bookmarks/bookmarks-export-druid-netscape.c
+++ b/bookmarks/bookmarks-export-druid-netscape.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-export-druid-netscape.h b/bookmarks/bookmarks-export-druid-netscape.h
index 3257b25..c7b4b40 100644
--- a/bookmarks/bookmarks-export-druid-netscape.h
+++ b/bookmarks/bookmarks-export-druid-netscape.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_export_druid_netscape_h
diff --git a/bookmarks/bookmarks-export-druid.c b/bookmarks/bookmarks-export-druid.c
index 7630002..05f157a 100644
--- a/bookmarks/bookmarks-export-druid.c
+++ b/bookmarks/bookmarks-export-druid.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-export-druid.h b/bookmarks/bookmarks-export-druid.h
index a59f09d..71c1572 100644
--- a/bookmarks/bookmarks-export-druid.h
+++ b/bookmarks/bookmarks-export-druid.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_export_druid_h
diff --git a/bookmarks/bookmarks-folder-tb-widget.c b/bookmarks/bookmarks-folder-tb-widget.c
index ef198d0..fedced3 100644
--- a/bookmarks/bookmarks-folder-tb-widget.c
+++ b/bookmarks/bookmarks-folder-tb-widget.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-folder-tb-widget.h b/bookmarks/bookmarks-folder-tb-widget.h
index a1a0437..446183b 100644
--- a/bookmarks/bookmarks-folder-tb-widget.h
+++ b/bookmarks/bookmarks-folder-tb-widget.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_folder_tb_widget_h
diff --git a/bookmarks/bookmarks-gtk-menu-item.c b/bookmarks/bookmarks-gtk-menu-item.c
index c9098b2..a5351af 100644
--- a/bookmarks/bookmarks-gtk-menu-item.c
+++ b/bookmarks/bookmarks-gtk-menu-item.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-gtk-menu-item.h b/bookmarks/bookmarks-gtk-menu-item.h
index 8997b17..912385f 100644
--- a/bookmarks/bookmarks-gtk-menu-item.h
+++ b/bookmarks/bookmarks-gtk-menu-item.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_gtk_menu_item_h
diff --git a/bookmarks/bookmarks-gtk-menu.c b/bookmarks/bookmarks-gtk-menu.c
index cdeb205..1f477a1 100644
--- a/bookmarks/bookmarks-gtk-menu.c
+++ b/bookmarks/bookmarks-gtk-menu.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-gtk-menu.h b/bookmarks/bookmarks-gtk-menu.h
index bc000d0..276d542 100644
--- a/bookmarks/bookmarks-gtk-menu.h
+++ b/bookmarks/bookmarks-gtk-menu.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_gtk_menu_h
diff --git a/bookmarks/bookmarks-gtk-toolbar-set.c b/bookmarks/bookmarks-gtk-toolbar-set.c
index f7adc77..25d81d1 100644
--- a/bookmarks/bookmarks-gtk-toolbar-set.c
+++ b/bookmarks/bookmarks-gtk-toolbar-set.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-gtk-toolbar-set.h b/bookmarks/bookmarks-gtk-toolbar-set.h
index 22715f9..15ca0b7 100644
--- a/bookmarks/bookmarks-gtk-toolbar-set.h
+++ b/bookmarks/bookmarks-gtk-toolbar-set.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_gtk_toolbar_set_h
diff --git a/bookmarks/bookmarks-gtk-toolbar.c b/bookmarks/bookmarks-gtk-toolbar.c
index 40c7f08..505cade 100644
--- a/bookmarks/bookmarks-gtk-toolbar.c
+++ b/bookmarks/bookmarks-gtk-toolbar.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-gtk-toolbar.h b/bookmarks/bookmarks-gtk-toolbar.h
index af8dd94..feb9633 100644
--- a/bookmarks/bookmarks-gtk-toolbar.h
+++ b/bookmarks/bookmarks-gtk-toolbar.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_gtk_toolbar_h
diff --git a/bookmarks/bookmarks-icon-provider.c b/bookmarks/bookmarks-icon-provider.c
index c9f1cd8..2dda05f 100644
--- a/bookmarks/bookmarks-icon-provider.c
+++ b/bookmarks/bookmarks-icon-provider.c
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-icon-provider.h b/bookmarks/bookmarks-icon-provider.h
index 45900e9..e373ddf 100644
--- a/bookmarks/bookmarks-icon-provider.h
+++ b/bookmarks/bookmarks-icon-provider.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GB_ICON_PROVIDER_H__
diff --git a/bookmarks/bookmarks-import-druid-epiphany.c b/bookmarks/bookmarks-import-druid-epiphany.c
index 586d04a..6a6c2a6 100644
--- a/bookmarks/bookmarks-import-druid-epiphany.c
+++ b/bookmarks/bookmarks-import-druid-epiphany.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bookmarks/bookmarks-import-druid-epiphany.h b/bookmarks/bookmarks-import-druid-epiphany.h
index 95c413b..dd95a7d 100644
--- a/bookmarks/bookmarks-import-druid-epiphany.h
+++ b/bookmarks/bookmarks-import-druid-epiphany.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/bookmarks/bookmarks-import-druid-konqueror.c b/bookmarks/bookmarks-import-druid-konqueror.c
index e6add28..17df749 100644
--- a/bookmarks/bookmarks-import-druid-konqueror.c
+++ b/bookmarks/bookmarks-import-druid-konqueror.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-import-druid-konqueror.h b/bookmarks/bookmarks-import-druid-konqueror.h
index 3ef1ced..2ef0e1a 100644
--- a/bookmarks/bookmarks-import-druid-konqueror.h
+++ b/bookmarks/bookmarks-import-druid-konqueror.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_import_druid_konqueror_h
diff --git a/bookmarks/bookmarks-import-druid-mozilla.c b/bookmarks/bookmarks-import-druid-mozilla.c
index 955a1f7..96f1102 100644
--- a/bookmarks/bookmarks-import-druid-mozilla.c
+++ b/bookmarks/bookmarks-import-druid-mozilla.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-import-druid-mozilla.h b/bookmarks/bookmarks-import-druid-mozilla.h
index 311dd6d..a847706 100644
--- a/bookmarks/bookmarks-import-druid-mozilla.h
+++ b/bookmarks/bookmarks-import-druid-mozilla.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_import_druid_mozilla_h
diff --git a/bookmarks/bookmarks-import-druid-netscape.c b/bookmarks/bookmarks-import-druid-netscape.c
index 7e8f166..5539430 100644
--- a/bookmarks/bookmarks-import-druid-netscape.c
+++ b/bookmarks/bookmarks-import-druid-netscape.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-import-druid-netscape.h b/bookmarks/bookmarks-import-druid-netscape.h
index 95d2eb1..72072da 100644
--- a/bookmarks/bookmarks-import-druid-netscape.h
+++ b/bookmarks/bookmarks-import-druid-netscape.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_import_druid_netscape_h
diff --git a/bookmarks/bookmarks-import-druid.c b/bookmarks/bookmarks-import-druid.c
index be2c104..12094b5 100644
--- a/bookmarks/bookmarks-import-druid.c
+++ b/bookmarks/bookmarks-import-druid.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-import-druid.h b/bookmarks/bookmarks-import-druid.h
index 480356a..c477ad6 100644
--- a/bookmarks/bookmarks-import-druid.h
+++ b/bookmarks/bookmarks-import-druid.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_import_druid_h
diff --git a/bookmarks/bookmarks-io.c b/bookmarks/bookmarks-io.c
index 1f6e59c..b481b46 100644
--- a/bookmarks/bookmarks-io.c
+++ b/bookmarks/bookmarks-io.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-io.h b/bookmarks/bookmarks-io.h
index 267f119..f73b651 100644
--- a/bookmarks/bookmarks-io.h
+++ b/bookmarks/bookmarks-io.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_io_h
diff --git a/bookmarks/bookmarks-iterator.c b/bookmarks/bookmarks-iterator.c
index 5f789fb..abe8764 100644
--- a/bookmarks/bookmarks-iterator.c
+++ b/bookmarks/bookmarks-iterator.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-iterator.h b/bookmarks/bookmarks-iterator.h
index ff8766b..b155f63 100644
--- a/bookmarks/bookmarks-iterator.h
+++ b/bookmarks/bookmarks-iterator.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_iterator_h
diff --git a/bookmarks/bookmarks-location-source.c b/bookmarks/bookmarks-location-source.c
index 184f98e..887c359 100644
--- a/bookmarks/bookmarks-location-source.c
+++ b/bookmarks/bookmarks-location-source.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-location-source.h b/bookmarks/bookmarks-location-source.h
index db7fd85..7ce585a 100644
--- a/bookmarks/bookmarks-location-source.h
+++ b/bookmarks/bookmarks-location-source.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GB_LOCATION_SOURCE_H__
diff --git a/bookmarks/bookmarks-mozilla.c b/bookmarks/bookmarks-mozilla.c
index 6f28175..1430ecb 100644
--- a/bookmarks/bookmarks-mozilla.c
+++ b/bookmarks/bookmarks-mozilla.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-mozilla.h b/bookmarks/bookmarks-mozilla.h
index ea45f73..b115f05 100644
--- a/bookmarks/bookmarks-mozilla.h
+++ b/bookmarks/bookmarks-mozilla.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __io_mozilla_h
diff --git a/bookmarks/bookmarks-netscape-mozilla.c b/bookmarks/bookmarks-netscape-mozilla.c
index 9c108b6..2e07658 100644
--- a/bookmarks/bookmarks-netscape-mozilla.c
+++ b/bookmarks/bookmarks-netscape-mozilla.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-netscape-mozilla.h b/bookmarks/bookmarks-netscape-mozilla.h
index cf68600..049b0e2 100644
--- a/bookmarks/bookmarks-netscape-mozilla.h
+++ b/bookmarks/bookmarks-netscape-mozilla.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This file is based on the original netscape.c file of galeon 1.x
diff --git a/bookmarks/bookmarks-netscape.c b/bookmarks/bookmarks-netscape.c
index d83d3b1..fd2bf65 100644
--- a/bookmarks/bookmarks-netscape.c
+++ b/bookmarks/bookmarks-netscape.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-netscape.h b/bookmarks/bookmarks-netscape.h
index 39ca579..22ef7e0 100644
--- a/bookmarks/bookmarks-netscape.h
+++ b/bookmarks/bookmarks-netscape.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __io_netscape_h
diff --git a/bookmarks/bookmarks-separator-tb-widget.c b/bookmarks/bookmarks-separator-tb-widget.c
index 4a43979..8079672 100644
--- a/bookmarks/bookmarks-separator-tb-widget.c
+++ b/bookmarks/bookmarks-separator-tb-widget.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-separator-tb-widget.h b/bookmarks/bookmarks-separator-tb-widget.h
index e5dc70c..a66ee24 100644
--- a/bookmarks/bookmarks-separator-tb-widget.h
+++ b/bookmarks/bookmarks-separator-tb-widget.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_separator_tb_widget_h
diff --git a/bookmarks/bookmarks-single-editor-small.c b/bookmarks/bookmarks-single-editor-small.c
index c3196de..9cbae91 100644
--- a/bookmarks/bookmarks-single-editor-small.c
+++ b/bookmarks/bookmarks-single-editor-small.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-single-editor-small.h b/bookmarks/bookmarks-single-editor-small.h
index 3072da6..abdfc5b 100644
--- a/bookmarks/bookmarks-single-editor-small.h
+++ b/bookmarks/bookmarks-single-editor-small.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_single_editor_small_h
diff --git a/bookmarks/bookmarks-single-editor.c b/bookmarks/bookmarks-single-editor.c
index a389a01..e84332f 100644
--- a/bookmarks/bookmarks-single-editor.c
+++ b/bookmarks/bookmarks-single-editor.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-single-editor.h b/bookmarks/bookmarks-single-editor.h
index 8485a32..6e219b6 100644
--- a/bookmarks/bookmarks-single-editor.h
+++ b/bookmarks/bookmarks-single-editor.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_single_editor_h
diff --git a/bookmarks/bookmarks-site-tb-widget.c b/bookmarks/bookmarks-site-tb-widget.c
index 2e261b7..842baa6 100644
--- a/bookmarks/bookmarks-site-tb-widget.c
+++ b/bookmarks/bookmarks-site-tb-widget.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-site-tb-widget.h b/bookmarks/bookmarks-site-tb-widget.h
index 75c6e5d..d744b30 100644
--- a/bookmarks/bookmarks-site-tb-widget.h
+++ b/bookmarks/bookmarks-site-tb-widget.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_site_tb_widget_h
diff --git a/bookmarks/bookmarks-smart-site-tb-widget.c b/bookmarks/bookmarks-smart-site-tb-widget.c
index 6a73703..c5f2cbc 100644
--- a/bookmarks/bookmarks-smart-site-tb-widget.c
+++ b/bookmarks/bookmarks-smart-site-tb-widget.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-smart-site-tb-widget.h b/bookmarks/bookmarks-smart-site-tb-widget.h
index 541b204..c7d41c1 100644
--- a/bookmarks/bookmarks-smart-site-tb-widget.h
+++ b/bookmarks/bookmarks-smart-site-tb-widget.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_smart_site_tb_widget_h
diff --git a/bookmarks/bookmarks-tb-widget.c b/bookmarks/bookmarks-tb-widget.c
index 4c35cd3..57a6ee3 100644
--- a/bookmarks/bookmarks-tb-widget.c
+++ b/bookmarks/bookmarks-tb-widget.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-tb-widget.h b/bookmarks/bookmarks-tb-widget.h
index 4ee6afc..7ba97e2 100644
--- a/bookmarks/bookmarks-tb-widget.h
+++ b/bookmarks/bookmarks-tb-widget.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_tb_widget_h
diff --git a/bookmarks/bookmarks-toolbar-widgets.c b/bookmarks/bookmarks-toolbar-widgets.c
index 2cc3311..0c1b766 100644
--- a/bookmarks/bookmarks-toolbar-widgets.c
+++ b/bookmarks/bookmarks-toolbar-widgets.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-toolbar-widgets.h b/bookmarks/bookmarks-toolbar-widgets.h
index 81f7816..6fe2801 100644
--- a/bookmarks/bookmarks-toolbar-widgets.h
+++ b/bookmarks/bookmarks-toolbar-widgets.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_toolbar_widgets_h
diff --git a/bookmarks/bookmarks-tree-model.c b/bookmarks/bookmarks-tree-model.c
index 83de945..8902cfe 100644
--- a/bookmarks/bookmarks-tree-model.c
+++ b/bookmarks/bookmarks-tree-model.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-tree-model.h b/bookmarks/bookmarks-tree-model.h
index 5916b48..cfb971d 100644
--- a/bookmarks/bookmarks-tree-model.h
+++ b/bookmarks/bookmarks-tree-model.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __BOOKMARKS_TREE_MODEL_H__
diff --git a/bookmarks/bookmarks-tree-view.c b/bookmarks/bookmarks-tree-view.c
index ccc41ab..1e7b8af 100644
--- a/bookmarks/bookmarks-tree-view.c
+++ b/bookmarks/bookmarks-tree-view.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-tree-view.h b/bookmarks/bookmarks-tree-view.h
index 3fea179..02f86e1 100644
--- a/bookmarks/bookmarks-tree-view.h
+++ b/bookmarks/bookmarks-tree-view.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_tree_view_h
diff --git a/bookmarks/bookmarks-util.c b/bookmarks/bookmarks-util.c
index 66b2431..3f4a252 100644
--- a/bookmarks/bookmarks-util.c
+++ b/bookmarks/bookmarks-util.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks-util.h b/bookmarks/bookmarks-util.h
index 03bff4a..085fecf 100644
--- a/bookmarks/bookmarks-util.h
+++ b/bookmarks/bookmarks-util.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_util_h
diff --git a/bookmarks/bookmarks-widgets-private.h b/bookmarks/bookmarks-widgets-private.h
index 7634ba4..9f40cdc 100644
--- a/bookmarks/bookmarks-widgets-private.h
+++ b/bookmarks/bookmarks-widgets-private.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtkcontainer.h>
diff --git a/bookmarks/bookmarks.c b/bookmarks/bookmarks.c
index ca99225..1b748f2 100644
--- a/bookmarks/bookmarks.c
+++ b/bookmarks/bookmarks.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/bookmarks.h b/bookmarks/bookmarks.h
index bd5f925..4d2e6bf 100644
--- a/bookmarks/bookmarks.h
+++ b/bookmarks/bookmarks.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_h
diff --git a/bookmarks/testbookmarks.c b/bookmarks/testbookmarks.c
index 21069d8..5045aa3 100644
--- a/bookmarks/testbookmarks.c
+++ b/bookmarks/testbookmarks.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/xbel.c b/bookmarks/xbel.c
index 5acd38b..e9a9bcc 100644
--- a/bookmarks/xbel.c
+++ b/bookmarks/xbel.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/bookmarks/xbel.h b/bookmarks/xbel.h
index 79e7ec9..ffd425d 100644
--- a/bookmarks/xbel.h
+++ b/bookmarks/xbel.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __xbel_h
diff --git a/embed/downloader-view.c b/embed/downloader-view.c
index b684e3d..a3aa6c1 100644
--- a/embed/downloader-view.c
+++ b/embed/downloader-view.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/embed/downloader-view.h b/embed/downloader-view.h
index 682a654..5a20d84 100644
--- a/embed/downloader-view.h
+++ b/embed/downloader-view.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef DOWNLOADER_VIEW_H
diff --git a/embed/galeon-embed-dialog.c b/embed/galeon-embed-dialog.c
index e3ea8cc..02febb3 100644
--- a/embed/galeon-embed-dialog.c
+++ b/embed/galeon-embed-dialog.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/embed/galeon-embed-dialog.h b/embed/galeon-embed-dialog.h
index 2d4b664..01cf1f3 100644
--- a/embed/galeon-embed-dialog.h
+++ b/embed/galeon-embed-dialog.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_DIALOG_H
diff --git a/embed/galeon-embed-event.c b/embed/galeon-embed-event.c
index 1692039..a76d597 100644
--- a/embed/galeon-embed-event.c
+++ b/embed/galeon-embed-event.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/embed/galeon-embed-event.h b/embed/galeon-embed-event.h
index ebf14bb..0ee8759 100644
--- a/embed/galeon-embed-event.h
+++ b/embed/galeon-embed-event.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_EVENT_H
diff --git a/embed/galeon-embed-find.c b/embed/galeon-embed-find.c
index aa7127c..08e04e6 100644
--- a/embed/galeon-embed-find.c
+++ b/embed/galeon-embed-find.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/embed/galeon-embed-find.h b/embed/galeon-embed-find.h
index 2be321d..0bb1db2 100644
--- a/embed/galeon-embed-find.h
+++ b/embed/galeon-embed-find.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/embed/galeon-embed-helper-list.c b/embed/galeon-embed-helper-list.c
index d8a55b9..3b63dff 100644
--- a/embed/galeon-embed-helper-list.c
+++ b/embed/galeon-embed-helper-list.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/embed/galeon-embed-helper-list.h b/embed/galeon-embed-helper-list.h
index d5258dc..006bde4 100644
--- a/embed/galeon-embed-helper-list.h
+++ b/embed/galeon-embed-helper-list.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_HELPER_LIST_H
diff --git a/embed/galeon-embed-persist.c b/embed/galeon-embed-persist.c
index 8c2cfe8..0c9abba 100644
--- a/embed/galeon-embed-persist.c
+++ b/embed/galeon-embed-persist.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/embed/galeon-embed-persist.h b/embed/galeon-embed-persist.h
index 6470669..05c5eea 100644
--- a/embed/galeon-embed-persist.h
+++ b/embed/galeon-embed-persist.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_PERSIST_H
diff --git a/embed/galeon-embed-shell.c b/embed/galeon-embed-shell.c
index 13488b2..f37efed 100644
--- a/embed/galeon-embed-shell.c
+++ b/embed/galeon-embed-shell.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/embed/galeon-embed-shell.h b/embed/galeon-embed-shell.h
index 64813ac..e83e7ad 100644
--- a/embed/galeon-embed-shell.h
+++ b/embed/galeon-embed-shell.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_SHELL_H
diff --git a/embed/galeon-embed-types.h b/embed/galeon-embed-types.h
index 38e19e7..91dd25d 100644
--- a/embed/galeon-embed-types.h
+++ b/embed/galeon-embed-types.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_TYPES_H
diff --git a/embed/galeon-embed-utils.c b/embed/galeon-embed-utils.c
index 4dbbcee..7c3a9b8 100644
--- a/embed/galeon-embed-utils.c
+++ b/embed/galeon-embed-utils.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/embed/galeon-embed-utils.h b/embed/galeon-embed-utils.h
index 1fded6d..183aa3f 100644
--- a/embed/galeon-embed-utils.h
+++ b/embed/galeon-embed-utils.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_UTILS_H
diff --git a/embed/galeon-embed.c b/embed/galeon-embed.c
index 054c21a..61d5058 100644
--- a/embed/galeon-embed.c
+++ b/embed/galeon-embed.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/embed/galeon-embed.h b/embed/galeon-embed.h
index 7663eb2..3c0550c 100644
--- a/embed/galeon-embed.h
+++ b/embed/galeon-embed.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_EMBED_H
diff --git a/embed/galeon-encodings.c b/embed/galeon-encodings.c
index 9b0df5a..c4dec01 100644
--- a/embed/galeon-encodings.c
+++ b/embed/galeon-encodings.c
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/embed/galeon-encodings.h b/embed/galeon-encodings.h
index 93e7f21..693e621 100644
--- a/embed/galeon-encodings.h
+++ b/embed/galeon-encodings.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_ENCODINGS_H
diff --git a/embed/global-history.c b/embed/global-history.c
index 08ea303..dbfcfe0 100644
--- a/embed/global-history.c
+++ b/embed/global-history.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/embed/global-history.h b/embed/global-history.h
index c139213..dfc67d9 100644
--- a/embed/global-history.h
+++ b/embed/global-history.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GLOBAL_HISTORY_H
diff --git a/embed/js-console.c b/embed/js-console.c
old mode 100755
new mode 100644
index 25a31f7..8d5ba8d
--- a/embed/js-console.c
+++ b/embed/js-console.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/embed/js-console.h b/embed/js-console.h
index dbc9bfe..fd18328 100644
--- a/embed/js-console.h
+++ b/embed/js-console.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef JS_CONSOLE_H
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
old mode 100755
new mode 100644
index 8fb176d..1d88e8e
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/embed/print-dialog.h b/embed/print-dialog.h
index 6a26fed..ccbd1de 100644
--- a/embed/print-dialog.h
+++ b/embed/print-dialog.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PRINT_DIALOG_H
diff --git a/gtkhtml/gtkhtml-embed-persist.c b/gtkhtml/gtkhtml-embed-persist.c
index b11b2a5..02f826c 100644
--- a/gtkhtml/gtkhtml-embed-persist.c
+++ b/gtkhtml/gtkhtml-embed-persist.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gtkhtml-embed-persist.h"
diff --git a/gtkhtml/gtkhtml-embed-persist.h b/gtkhtml/gtkhtml-embed-persist.h
index ed8506e..d5c5c8a 100644
--- a/gtkhtml/gtkhtml-embed-persist.h
+++ b/gtkhtml/gtkhtml-embed-persist.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GTKHTML_EMBED_PERSIST_H
diff --git a/gtkhtml/gtkhtml-embed-shell.c b/gtkhtml/gtkhtml-embed-shell.c
index a5a4ae6..1dea5b1 100644
--- a/gtkhtml/gtkhtml-embed-shell.c
+++ b/gtkhtml/gtkhtml-embed-shell.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gtkhtml-embed-shell.h"
diff --git a/gtkhtml/gtkhtml-embed-shell.h b/gtkhtml/gtkhtml-embed-shell.h
index 8fd25d1..ceba4a0 100644
--- a/gtkhtml/gtkhtml-embed-shell.h
+++ b/gtkhtml/gtkhtml-embed-shell.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GTKHTML_EMBED_SHELL_H
diff --git a/gtkhtml/gtkhtml-embed.c b/gtkhtml/gtkhtml-embed.c
index f1b4be8..5eb4749 100644
--- a/gtkhtml/gtkhtml-embed.c
+++ b/gtkhtml/gtkhtml-embed.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "gtkhtml-embed.h"
diff --git a/gtkhtml/gtkhtml-embed.h b/gtkhtml/gtkhtml-embed.h
index 68c5a06..2d79b20 100644
--- a/gtkhtml/gtkhtml-embed.h
+++ b/gtkhtml/gtkhtml-embed.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GTKHTML_EMBED_H
diff --git a/libegg/dock/egg-dock-box.c b/libegg/dock/egg-dock-box.c
index ad86492..67530c5 100644
--- a/libegg/dock/egg-dock-box.c
+++ b/libegg/dock/egg-dock-box.c
@@ -16,9 +16,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-box.h b/libegg/dock/egg-dock-box.h
index a6b7e9b..f74d6a7 100644
--- a/libegg/dock/egg-dock-box.h
+++ b/libegg/dock/egg-dock-box.h
@@ -16,9 +16,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_BOX_H__
diff --git a/libegg/dock/egg-dock-item.c b/libegg/dock/egg-dock-item.c
index 2ac2d99..3608cc3 100644
--- a/libegg/dock/egg-dock-item.c
+++ b/libegg/dock/egg-dock-item.c
@@ -23,9 +23,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/libegg/dock/egg-dock-item.h b/libegg/dock/egg-dock-item.h
index 3185ce6..6d5e7b0 100644
--- a/libegg/dock/egg-dock-item.h
+++ b/libegg/dock/egg-dock-item.h
@@ -23,9 +23,7 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __EGG_DOCK_ITEM_H__
diff --git a/libegg/dock/egg-dock-layout.c b/libegg/dock/egg-dock-layout.c
index f1d5e08..3f945c9 100644
--- a/libegg/dock/egg-dock-layout.c
+++ b/libegg/dock/egg-dock-layout.c
@@ -16,9 +16,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-layout.h b/libegg/dock/egg-dock-layout.h
index e101ee8..ddebca3 100644
--- a/libegg/dock/egg-dock-layout.h
+++ b/libegg/dock/egg-dock-layout.h
@@ -13,9 +13,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 
diff --git a/libegg/dock/egg-dock-master.c b/libegg/dock/egg-dock-master.c
index 746f65c..88528ac 100644
--- a/libegg/dock/egg-dock-master.c
+++ b/libegg/dock/egg-dock-master.c
@@ -16,9 +16,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-master.h b/libegg/dock/egg-dock-master.h
index 12288ec..d76b357 100644
--- a/libegg/dock/egg-dock-master.h
+++ b/libegg/dock/egg-dock-master.h
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_MASTER_H__
diff --git a/libegg/dock/egg-dock-notebook.c b/libegg/dock/egg-dock-notebook.c
index 6d044ae..11753e4 100644
--- a/libegg/dock/egg-dock-notebook.c
+++ b/libegg/dock/egg-dock-notebook.c
@@ -14,9 +14,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-notebook.h b/libegg/dock/egg-dock-notebook.h
index 66ee97b..72b96c1 100644
--- a/libegg/dock/egg-dock-notebook.h
+++ b/libegg/dock/egg-dock-notebook.h
@@ -14,9 +14,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_NOTEBOOK_H__
diff --git a/libegg/dock/egg-dock-object.c b/libegg/dock/egg-dock-object.c
index cafd253..245cfc7 100644
--- a/libegg/dock/egg-dock-object.c
+++ b/libegg/dock/egg-dock-object.c
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-object.h b/libegg/dock/egg-dock-object.h
index 8522b34..d5e0188 100644
--- a/libegg/dock/egg-dock-object.h
+++ b/libegg/dock/egg-dock-object.h
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_OBJECT_H__
diff --git a/libegg/dock/egg-dock-paned.c b/libegg/dock/egg-dock-paned.c
index 4337019..4246c2f 100644
--- a/libegg/dock/egg-dock-paned.c
+++ b/libegg/dock/egg-dock-paned.c
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-paned.h b/libegg/dock/egg-dock-paned.h
index 4c14016..b467017 100644
--- a/libegg/dock/egg-dock-paned.h
+++ b/libegg/dock/egg-dock-paned.h
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_PANED_H__
diff --git a/libegg/dock/egg-dock-placeholder.c b/libegg/dock/egg-dock-placeholder.c
index b8ce199..842b7b4 100644
--- a/libegg/dock/egg-dock-placeholder.c
+++ b/libegg/dock/egg-dock-placeholder.c
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-placeholder.h b/libegg/dock/egg-dock-placeholder.h
index a18f44a..1218d27 100644
--- a/libegg/dock/egg-dock-placeholder.h
+++ b/libegg/dock/egg-dock-placeholder.h
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_PLACEHOLDER_H__
diff --git a/libegg/dock/egg-dock-tablabel.c b/libegg/dock/egg-dock-tablabel.c
index b5cad08..be0db76 100644
--- a/libegg/dock/egg-dock-tablabel.c
+++ b/libegg/dock/egg-dock-tablabel.c
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock-tablabel.h b/libegg/dock/egg-dock-tablabel.h
index 2f52e9a..4e088ca 100644
--- a/libegg/dock/egg-dock-tablabel.h
+++ b/libegg/dock/egg-dock-tablabel.h
@@ -15,9 +15,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_TABLABEL_H__
diff --git a/libegg/dock/egg-dock.c b/libegg/dock/egg-dock.c
index 91e768a..c0f4380 100644
--- a/libegg/dock/egg-dock.c
+++ b/libegg/dock/egg-dock.c
@@ -13,9 +13,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/libegg/dock/egg-dock.h b/libegg/dock/egg-dock.h
index 3f05e0b..6892625 100644
--- a/libegg/dock/egg-dock.h
+++ b/libegg/dock/egg-dock.h
@@ -13,9 +13,7 @@
  * 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.  
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  
  */
 
 #ifndef __EGG_DOCK_H__
diff --git a/libegg/egg-editable-toolbar.c b/libegg/egg-editable-toolbar.c
index efd1963..0e7f3d0 100644
--- a/libegg/egg-editable-toolbar.c
+++ b/libegg/egg-editable-toolbar.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libegg/egg-editable-toolbar.h b/libegg/egg-editable-toolbar.h
index 67d07e2..df19f1f 100644
--- a/libegg/egg-editable-toolbar.h
+++ b/libegg/egg-editable-toolbar.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libegg/egg-recent-item.c b/libegg/egg-recent-item.c
index 9be7970..83f1f50 100644
--- a/libegg/egg-recent-item.c
+++ b/libegg/egg-recent-item.c
@@ -11,8 +11,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
  *   James Willcox <jwillcox cs indiana edu>
diff --git a/libegg/egg-recent-model.c b/libegg/egg-recent-model.c
index 86ce6e7..e5880d9 100644
--- a/libegg/egg-recent-model.c
+++ b/libegg/egg-recent-model.c
@@ -11,8 +11,7 @@
  * 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  * Authors:
  *   James Willcox <jwillcox cs indiana edu>
diff --git a/libegg/egg-toolbar-editor.c b/libegg/egg-toolbar-editor.c
index e37caa6..ef50e45 100644
--- a/libegg/egg-toolbar-editor.c
+++ b/libegg/egg-toolbar-editor.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libegg/egg-toolbar-editor.h b/libegg/egg-toolbar-editor.h
index e1e1f35..9f07cf7 100644
--- a/libegg/egg-toolbar-editor.h
+++ b/libegg/egg-toolbar-editor.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_TOOLBAR_EDITOR_H
diff --git a/libegg/egg-toolbars-model.c b/libegg/egg-toolbars-model.c
index 99b3397..73b981e 100644
--- a/libegg/egg-toolbars-model.c
+++ b/libegg/egg-toolbars-model.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/libegg/egg-toolbars-model.h b/libegg/egg-toolbars-model.h
index 11d9bbe..269a37d 100644
--- a/libegg/egg-toolbars-model.h
+++ b/libegg/egg-toolbars-model.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EGG_TOOLBARS_MODEL_H
diff --git a/mozilla/AutoJSContextStack.cpp b/mozilla/AutoJSContextStack.cpp
index 6f2fbfe..e00a8e0 100644
--- a/mozilla/AutoJSContextStack.cpp
+++ b/mozilla/AutoJSContextStack.cpp
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/AutoJSContextStack.h b/mozilla/AutoJSContextStack.h
index 4883a54..c53504c 100644
--- a/mozilla/AutoJSContextStack.h
+++ b/mozilla/AutoJSContextStack.h
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/ContentHandler.cpp b/mozilla/ContentHandler.cpp
index e6aec98..d3a1cd4 100644
--- a/mozilla/ContentHandler.cpp
+++ b/mozilla/ContentHandler.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/mozilla/ContentHandler.h b/mozilla/ContentHandler.h
index 8eb4ad5..0929684 100644
--- a/mozilla/ContentHandler.h
+++ b/mozilla/ContentHandler.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __ContentHandler_h
diff --git a/mozilla/CookieObserver.cpp b/mozilla/CookieObserver.cpp
index 7bc8d84..ea39442 100644
--- a/mozilla/CookieObserver.cpp
+++ b/mozilla/CookieObserver.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "CookieObserver.h"
diff --git a/mozilla/CookieObserver.h b/mozilla/CookieObserver.h
index 3b6cde3..c6aec50 100644
--- a/mozilla/CookieObserver.h
+++ b/mozilla/CookieObserver.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #include <nsIObserver.h>
diff --git a/mozilla/EphyDirectoryProvider.cpp b/mozilla/EphyDirectoryProvider.cpp
index adca470..c8fe8c7 100644
--- a/mozilla/EphyDirectoryProvider.cpp
+++ b/mozilla/EphyDirectoryProvider.cpp
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/EphyDirectoryProvider.h b/mozilla/EphyDirectoryProvider.h
index 9c0a5b9..6ae9b30 100644
--- a/mozilla/EphyDirectoryProvider.h
+++ b/mozilla/EphyDirectoryProvider.h
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  $Id$
  */
diff --git a/mozilla/EphyPromptService.cpp b/mozilla/EphyPromptService.cpp
index 982a2f8..99a1731 100644
--- a/mozilla/EphyPromptService.cpp
+++ b/mozilla/EphyPromptService.cpp
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/EphyPromptService.h b/mozilla/EphyPromptService.h
index 96cf771..9625914 100644
--- a/mozilla/EphyPromptService.h
+++ b/mozilla/EphyPromptService.h
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/EventContext.cpp b/mozilla/EventContext.cpp
index 3a15ab7..bd371ed 100644
--- a/mozilla/EventContext.cpp
+++ b/mozilla/EventContext.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/mozilla/EventContext.h b/mozilla/EventContext.h
index f2819b4..d139da3 100644
--- a/mozilla/EventContext.h
+++ b/mozilla/EventContext.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef EVENT_CONTEXT_H
diff --git a/mozilla/ExternalProtocolService.cpp b/mozilla/ExternalProtocolService.cpp
index 85ba677..6d08d57 100644
--- a/mozilla/ExternalProtocolService.cpp
+++ b/mozilla/ExternalProtocolService.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/mozilla/ExternalProtocolService.h b/mozilla/ExternalProtocolService.h
index c88bb9a..b3087e2 100644
--- a/mozilla/ExternalProtocolService.h
+++ b/mozilla/ExternalProtocolService.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef __ExternalProtocolService_h__
diff --git a/mozilla/FilePicker.cpp b/mozilla/FilePicker.cpp
index 390e173..bcc780c 100644
--- a/mozilla/FilePicker.cpp
+++ b/mozilla/FilePicker.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/FilePicker.h b/mozilla/FilePicker.h
index 7eeaf06..d5445ec 100644
--- a/mozilla/FilePicker.h
+++ b/mozilla/FilePicker.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/GaleonAboutModule.cpp b/mozilla/GaleonAboutModule.cpp
index 025f632..c05b8a1 100644
--- a/mozilla/GaleonAboutModule.cpp
+++ b/mozilla/GaleonAboutModule.cpp
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/GaleonAboutModule.h b/mozilla/GaleonAboutModule.h
index ad79fd4..688d454 100644
--- a/mozilla/GaleonAboutModule.h
+++ b/mozilla/GaleonAboutModule.h
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
  
diff --git a/mozilla/GaleonFind.cpp b/mozilla/GaleonFind.cpp
index f633540..5ffb4eb 100644
--- a/mozilla/GaleonFind.cpp
+++ b/mozilla/GaleonFind.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/GaleonFind.h b/mozilla/GaleonFind.h
index 04dcc9c..95940ee 100644
--- a/mozilla/GaleonFind.h
+++ b/mozilla/GaleonFind.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/GaleonJS.cpp b/mozilla/GaleonJS.cpp
index 6dab4e5..39935a6 100644
--- a/mozilla/GaleonJS.cpp
+++ b/mozilla/GaleonJS.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* IMPORTANT: This file contains functions that require the old style
diff --git a/mozilla/GaleonJS.h b/mozilla/GaleonJS.h
index da0da57..84009e3 100644
--- a/mozilla/GaleonJS.h
+++ b/mozilla/GaleonJS.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GALEON_JS_H
 #define GALEON_JS_H
diff --git a/mozilla/GaleonUtils.cpp b/mozilla/GaleonUtils.cpp
index c150cec..c809dca 100644
--- a/mozilla/GaleonUtils.cpp
+++ b/mozilla/GaleonUtils.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/mozilla/GaleonUtils.h b/mozilla/GaleonUtils.h
index 7e8d7a1..68e1445 100644
--- a/mozilla/GaleonUtils.h
+++ b/mozilla/GaleonUtils.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_UTILS_H
diff --git a/mozilla/GaleonWrapper.cpp b/mozilla/GaleonWrapper.cpp
index bf6ea1b..616f2c0 100644
--- a/mozilla/GaleonWrapper.cpp
+++ b/mozilla/GaleonWrapper.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/GaleonWrapper.h b/mozilla/GaleonWrapper.h
index 68199cb..63fd131 100644
--- a/mozilla/GaleonWrapper.h
+++ b/mozilla/GaleonWrapper.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_WRAPPER_H
diff --git a/mozilla/GlobalHistory.cpp b/mozilla/GlobalHistory.cpp
index 569daf8..200b043 100644
--- a/mozilla/GlobalHistory.cpp
+++ b/mozilla/GlobalHistory.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/GlobalHistory.h b/mozilla/GlobalHistory.h
index 7c34ed7..19130e5 100644
--- a/mozilla/GlobalHistory.h
+++ b/mozilla/GlobalHistory.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GlobalHistory_h
diff --git a/mozilla/GtkNSSClientAuthDialogs.cpp b/mozilla/GtkNSSClientAuthDialogs.cpp
index 2055c15..7a69fe4 100644
--- a/mozilla/GtkNSSClientAuthDialogs.cpp
+++ b/mozilla/GtkNSSClientAuthDialogs.cpp
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/GtkNSSDialogs.cpp b/mozilla/GtkNSSDialogs.cpp
index d615d51..42ca75f 100644
--- a/mozilla/GtkNSSDialogs.cpp
+++ b/mozilla/GtkNSSDialogs.cpp
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/mozilla/GtkNSSKeyPairDialogs.cpp b/mozilla/GtkNSSKeyPairDialogs.cpp
index e9ee33a..33b4dc6 100644
--- a/mozilla/GtkNSSKeyPairDialogs.cpp
+++ b/mozilla/GtkNSSKeyPairDialogs.cpp
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/mozilla/GulString.h b/mozilla/GulString.h
index c9a3e69..6c94fb3 100644
--- a/mozilla/GulString.h
+++ b/mozilla/GulString.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* This provides string classes that have a more feature rich API
diff --git a/mozilla/JSConsoleListener.cpp b/mozilla/JSConsoleListener.cpp
index 6f3a281..59ed13f 100644
--- a/mozilla/JSConsoleListener.cpp
+++ b/mozilla/JSConsoleListener.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/JSConsoleListener.h b/mozilla/JSConsoleListener.h
index 28e5a68..fc2dc74 100644
--- a/mozilla/JSConsoleListener.h
+++ b/mozilla/JSConsoleListener.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "nsIConsoleListener.h"
diff --git a/mozilla/JSConsoleService.cpp b/mozilla/JSConsoleService.cpp
index 45f8cb4..fca1352 100644
--- a/mozilla/JSConsoleService.cpp
+++ b/mozilla/JSConsoleService.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "JSConsoleService.h"
diff --git a/mozilla/JSConsoleService.h b/mozilla/JSConsoleService.h
index d93cb98..2d7e681 100644
--- a/mozilla/JSConsoleService.h
+++ b/mozilla/JSConsoleService.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GJSConsoleService_h
diff --git a/mozilla/MozRegisterComponents.cpp b/mozilla/MozRegisterComponents.cpp
index ff9b4ec..abbabeb 100644
--- a/mozilla/MozRegisterComponents.cpp
+++ b/mozilla/MozRegisterComponents.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/MozRegisterComponents.h b/mozilla/MozRegisterComponents.h
index 00f2448..6b1b87b 100644
--- a/mozilla/MozRegisterComponents.h
+++ b/mozilla/MozRegisterComponents.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __MozRegisterComponents_h
diff --git a/mozilla/MozillaPrivate.cpp b/mozilla/MozillaPrivate.cpp
index e43c4c0..326a105 100644
--- a/mozilla/MozillaPrivate.cpp
+++ b/mozilla/MozillaPrivate.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* IMPORTANT: This file contains functions that require the old style
diff --git a/mozilla/MozillaPrivate.h b/mozilla/MozillaPrivate.h
index d5643e6..9c85386 100644
--- a/mozilla/MozillaPrivate.h
+++ b/mozilla/MozillaPrivate.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef MOZILLA_PRIVATE_H
 #define MOZILLA_PRIVATE_H
diff --git a/mozilla/MyportalProtocolHandler.cpp b/mozilla/MyportalProtocolHandler.cpp
index cec6695..1481dec 100644
--- a/mozilla/MyportalProtocolHandler.cpp
+++ b/mozilla/MyportalProtocolHandler.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/MyportalProtocolHandler.h b/mozilla/MyportalProtocolHandler.h
index ac4ae43..d52f748 100644
--- a/mozilla/MyportalProtocolHandler.h
+++ b/mozilla/MyportalProtocolHandler.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
  
 #ifndef MyportalProtocolHandler_h__
diff --git a/mozilla/PrintProgressListener.cpp b/mozilla/PrintProgressListener.cpp
index 526cfd4..f4a41d5 100644
--- a/mozilla/PrintProgressListener.cpp
+++ b/mozilla/PrintProgressListener.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/mozilla/PrintProgressListener.h b/mozilla/PrintProgressListener.h
index f78a072..ce4cd07 100644
--- a/mozilla/PrintProgressListener.h
+++ b/mozilla/PrintProgressListener.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __PrintProgressListener_h_
diff --git a/mozilla/ProgressListener.cpp b/mozilla/ProgressListener.cpp
index 1832a10..a4bf1cc 100644
--- a/mozilla/ProgressListener.cpp
+++ b/mozilla/ProgressListener.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/ProgressListener.h b/mozilla/ProgressListener.h
index c6fad77..a1adc92 100644
--- a/mozilla/ProgressListener.h
+++ b/mozilla/ProgressListener.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  *  As of 5th Jan 2005: The progress listener can optionally implement
  *  nsIObserver which allows it to be informed of the temporary file being
diff --git a/mozilla/SideBarProxy.cpp b/mozilla/SideBarProxy.cpp
index d0d6ead..e7fbb6f 100644
--- a/mozilla/SideBarProxy.cpp
+++ b/mozilla/SideBarProxy.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/SideBarProxy.h b/mozilla/SideBarProxy.h
index e192059..1ffceab 100644
--- a/mozilla/SideBarProxy.h
+++ b/mozilla/SideBarProxy.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __sidebarproxy_h
diff --git a/mozilla/mozilla-embed-find.cpp b/mozilla/mozilla-embed-find.cpp
index d1c46f9..6b2cad2 100644
--- a/mozilla/mozilla-embed-find.cpp
+++ b/mozilla/mozilla-embed-find.cpp
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/mozilla-embed-find.h b/mozilla/mozilla-embed-find.h
index 902eae0..8df2969 100644
--- a/mozilla/mozilla-embed-find.h
+++ b/mozilla/mozilla-embed-find.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/mozilla-embed-persist.cpp b/mozilla/mozilla-embed-persist.cpp
index 1c8996a..04fd314 100644
--- a/mozilla/mozilla-embed-persist.cpp
+++ b/mozilla/mozilla-embed-persist.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/mozilla-embed-persist.h b/mozilla/mozilla-embed-persist.h
index 1632f61..394c84e 100644
--- a/mozilla/mozilla-embed-persist.h
+++ b/mozilla/mozilla-embed-persist.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MOZILLA_EMBED_PERSIST_H
diff --git a/mozilla/mozilla-embed-shell.cpp b/mozilla/mozilla-embed-shell.cpp
index 9baeb70..e884548 100644
--- a/mozilla/mozilla-embed-shell.cpp
+++ b/mozilla/mozilla-embed-shell.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/mozilla-embed-shell.h b/mozilla/mozilla-embed-shell.h
index 694e5fe..9d9bb2b 100644
--- a/mozilla/mozilla-embed-shell.h
+++ b/mozilla/mozilla-embed-shell.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MOZILLA_EMBED_SHELL_H
diff --git a/mozilla/mozilla-embed.cpp b/mozilla/mozilla-embed.cpp
index d930232..72d7cd8 100644
--- a/mozilla/mozilla-embed.cpp
+++ b/mozilla/mozilla-embed.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/mozilla-embed.h b/mozilla/mozilla-embed.h
index 4ccfc6e..86ec8b2 100644
--- a/mozilla/mozilla-embed.h
+++ b/mozilla/mozilla-embed.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MOZILLA_EMBED_H
diff --git a/mozilla/mozilla-encodings.c b/mozilla/mozilla-encodings.c
index 2e29d5b..db07231 100644
--- a/mozilla/mozilla-encodings.c
+++ b/mozilla/mozilla-encodings.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/mozilla-encodings.h b/mozilla/mozilla-encodings.h
index 9bd8ba1..2481d70 100644
--- a/mozilla/mozilla-encodings.h
+++ b/mozilla/mozilla-encodings.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/mozilla/mozilla-i18n.c b/mozilla/mozilla-i18n.c
index e594eae..1e9bc01 100644
--- a/mozilla/mozilla-i18n.c
+++ b/mozilla/mozilla-i18n.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/mozilla-i18n.h b/mozilla/mozilla-i18n.h
index dd269ee..6aef651 100644
--- a/mozilla/mozilla-i18n.h
+++ b/mozilla/mozilla-i18n.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/mozilla/mozilla-notifiers.cpp b/mozilla/mozilla-notifiers.cpp
index a9012b7..1fcceff 100644
--- a/mozilla/mozilla-notifiers.cpp
+++ b/mozilla/mozilla-notifiers.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/mozilla/mozilla-notifiers.h b/mozilla/mozilla-notifiers.h
index a321315..5117593 100644
--- a/mozilla/mozilla-notifiers.h
+++ b/mozilla/mozilla-notifiers.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MOZILLA_NOTIFIERS_H
diff --git a/mozilla/mozilla-prefs.cpp b/mozilla/mozilla-prefs.cpp
index 7a9a60c..422ae69 100644
--- a/mozilla/mozilla-prefs.cpp
+++ b/mozilla/mozilla-prefs.cpp
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "mozilla-prefs.h"
diff --git a/mozilla/mozilla-prefs.h b/mozilla/mozilla-prefs.h
index 82055c4..b8423be 100644
--- a/mozilla/mozilla-prefs.h
+++ b/mozilla/mozilla-prefs.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MOZILLA_PREFS_H
diff --git a/src/galeon-action-favicon.c b/src/galeon-action-favicon.c
index fbb4c8c..bd2c066 100644
--- a/src/galeon-action-favicon.c
+++ b/src/galeon-action-favicon.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-favicon.h b/src/galeon-action-favicon.h
index 5e8d114..4c9e3f1 100644
--- a/src/galeon-action-favicon.h
+++ b/src/galeon-action-favicon.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_FAVICON_ACTION_H
diff --git a/src/galeon-action-go.c b/src/galeon-action-go.c
index 39defb5..9592463 100644
--- a/src/galeon-action-go.c
+++ b/src/galeon-action-go.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-go.h b/src/galeon-action-go.h
index 5305138..1ece7a8 100644
--- a/src/galeon-action-go.h
+++ b/src/galeon-action-go.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_GO_ACTION_H
diff --git a/src/galeon-action-home.c b/src/galeon-action-home.c
index 2437c56..e240fe4 100644
--- a/src/galeon-action-home.c
+++ b/src/galeon-action-home.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-home.h b/src/galeon-action-home.h
index 75e1dc7..aa27734 100644
--- a/src/galeon-action-home.h
+++ b/src/galeon-action-home.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_HOME_ACTION_H
diff --git a/src/galeon-action-location.c b/src/galeon-action-location.c
index e905f68..99183af 100644
--- a/src/galeon-action-location.c
+++ b/src/galeon-action-location.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-location.h b/src/galeon-action-location.h
index fb5fa7f..4efa262 100644
--- a/src/galeon-action-location.h
+++ b/src/galeon-action-location.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_LOCATION_ACTION_H
diff --git a/src/galeon-action-navigation.c b/src/galeon-action-navigation.c
index a868555..98c0e2a 100644
--- a/src/galeon-action-navigation.c
+++ b/src/galeon-action-navigation.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-navigation.h b/src/galeon-action-navigation.h
index a84a21a..1706016 100644
--- a/src/galeon-action-navigation.h
+++ b/src/galeon-action-navigation.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_NAVIGATION_ACTION_H
diff --git a/src/galeon-action-new.c b/src/galeon-action-new.c
index c8d9860..8619bbd 100644
--- a/src/galeon-action-new.c
+++ b/src/galeon-action-new.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-new.h b/src/galeon-action-new.h
index d0970c2..7d00d8f 100644
--- a/src/galeon-action-new.h
+++ b/src/galeon-action-new.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_NEW_ACTION_H
diff --git a/src/galeon-action-refresh.c b/src/galeon-action-refresh.c
index ce3ca6e..697b3eb 100644
--- a/src/galeon-action-refresh.c
+++ b/src/galeon-action-refresh.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-refresh.h b/src/galeon-action-refresh.h
index 5b5e384..ef6d022 100644
--- a/src/galeon-action-refresh.h
+++ b/src/galeon-action-refresh.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_REFRESH_ACTION_H
diff --git a/src/galeon-action-spinner.c b/src/galeon-action-spinner.c
index f540c60..a86a96a 100644
--- a/src/galeon-action-spinner.c
+++ b/src/galeon-action-spinner.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-spinner.h b/src/galeon-action-spinner.h
index e89422f..0795983 100644
--- a/src/galeon-action-spinner.h
+++ b/src/galeon-action-spinner.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_SPINNER_ACTION_H
diff --git a/src/galeon-action-stop.c b/src/galeon-action-stop.c
index 3d35cdd..166997c 100644
--- a/src/galeon-action-stop.c
+++ b/src/galeon-action-stop.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-stop.h b/src/galeon-action-stop.h
index 4d4ce7d..bbfe26d 100644
--- a/src/galeon-action-stop.h
+++ b/src/galeon-action-stop.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_STOP_ACTION_H
diff --git a/src/galeon-action-zoom.c b/src/galeon-action-zoom.c
index fe32ca2..7c841ce 100644
--- a/src/galeon-action-zoom.c
+++ b/src/galeon-action-zoom.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action-zoom.h b/src/galeon-action-zoom.h
index 6053f32..92ebac6 100644
--- a/src/galeon-action-zoom.h
+++ b/src/galeon-action-zoom.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_ZOOM_ACTION_H
diff --git a/src/galeon-action.c b/src/galeon-action.c
index 5aa6df2..d5fa562 100644
--- a/src/galeon-action.c
+++ b/src/galeon-action.c
@@ -12,8 +12,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNgalU 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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-action.h b/src/galeon-action.h
index 672905d..2c100aa 100644
--- a/src/galeon-action.h
+++ b/src/galeon-action.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_ACTION_H
diff --git a/src/galeon-bookmarks-icon-provider.c b/src/galeon-bookmarks-icon-provider.c
index 18adf9f..d5005b9 100644
--- a/src/galeon-bookmarks-icon-provider.c
+++ b/src/galeon-bookmarks-icon-provider.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-bookmarks-icon-provider.h b/src/galeon-bookmarks-icon-provider.h
index 9510b62..855421f 100644
--- a/src/galeon-bookmarks-icon-provider.h
+++ b/src/galeon-bookmarks-icon-provider.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __bookmarks_galeon_icon_provider_h
diff --git a/src/galeon-css-menu.c b/src/galeon-css-menu.c
index 9025f84..2490f2c 100644
--- a/src/galeon-css-menu.c
+++ b/src/galeon-css-menu.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-css-menu.h b/src/galeon-css-menu.h
index 92a4a3c..d1f6a1c 100644
--- a/src/galeon-css-menu.h
+++ b/src/galeon-css-menu.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_altenate_css_menu_
diff --git a/src/galeon-embed-autoscroller.c b/src/galeon-embed-autoscroller.c
index 866c151..6adce9d 100644
--- a/src/galeon-embed-autoscroller.c
+++ b/src/galeon-embed-autoscroller.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* this file is based on work of Daniel Erat for galeon 1 */
diff --git a/src/galeon-embed-autoscroller.h b/src/galeon-embed-autoscroller.h
index f38fedf..66d9975 100644
--- a/src/galeon-embed-autoscroller.h
+++ b/src/galeon-embed-autoscroller.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_embed_autoscroller_h
diff --git a/src/galeon-embed-favicon.c b/src/galeon-embed-favicon.c
index 620b75a..54a253b 100644
--- a/src/galeon-embed-favicon.c
+++ b/src/galeon-embed-favicon.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-embed-favicon.h b/src/galeon-embed-favicon.h
index bd85874..3b8e1dc 100644
--- a/src/galeon-embed-favicon.h
+++ b/src/galeon-embed-favicon.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/src/galeon-embed-manual-scroller.c b/src/galeon-embed-manual-scroller.c
index d96adaf..451f2aa 100644
--- a/src/galeon-embed-manual-scroller.c
+++ b/src/galeon-embed-manual-scroller.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-embed-manual-scroller.h b/src/galeon-embed-manual-scroller.h
index 1631bce..b33dfb0 100644
--- a/src/galeon-embed-manual-scroller.h
+++ b/src/galeon-embed-manual-scroller.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_embed_manual_scroller_h
diff --git a/src/galeon-encoding-dialog.c b/src/galeon-encoding-dialog.c
index b88ae1e..2f3e1d4 100644
--- a/src/galeon-encoding-dialog.c
+++ b/src/galeon-encoding-dialog.c
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/galeon-encoding-dialog.h b/src/galeon-encoding-dialog.h
index 38ea2ae..48a12c9 100644
--- a/src/galeon-encoding-dialog.h
+++ b/src/galeon-encoding-dialog.h
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_ENCODING_DIALOG_H
diff --git a/src/galeon-encoding-menu.c b/src/galeon-encoding-menu.c
index 58a00e4..fc97c85 100644
--- a/src/galeon-encoding-menu.c
+++ b/src/galeon-encoding-menu.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-encoding-menu.h b/src/galeon-encoding-menu.h
index 3d548bb..dcd3959 100644
--- a/src/galeon-encoding-menu.h
+++ b/src/galeon-encoding-menu.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_altenate_encoding_menu_
diff --git a/src/galeon-favicon-action.c b/src/galeon-favicon-action.c
index c9329da..d1753e2 100644
--- a/src/galeon-favicon-action.c
+++ b/src/galeon-favicon-action.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-favicon-action.h b/src/galeon-favicon-action.h
index 6d50fa2..4df7e4f 100644
--- a/src/galeon-favicon-action.h
+++ b/src/galeon-favicon-action.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_FAVICON_ACTION_H
diff --git a/src/galeon-favicon-cache.c b/src/galeon-favicon-cache.c
index 96ac070..9b83895 100644
--- a/src/galeon-favicon-cache.c
+++ b/src/galeon-favicon-cache.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-favicon-cache.h b/src/galeon-favicon-cache.h
index 1ca8e75..107a64c 100644
--- a/src/galeon-favicon-cache.h
+++ b/src/galeon-favicon-cache.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/src/galeon-favicon.c b/src/galeon-favicon.c
index b456aca..b1c717b 100644
--- a/src/galeon-favicon.c
+++ b/src/galeon-favicon.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-favicon.h b/src/galeon-favicon.h
index 507d1ad..b2f7e4d 100644
--- a/src/galeon-favicon.h
+++ b/src/galeon-favicon.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib-object.h>
diff --git a/src/galeon-main.c b/src/galeon-main.c
index ce71147..ac5c18d 100644
--- a/src/galeon-main.c
+++ b/src/galeon-main.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-popup.c b/src/galeon-popup.c
index a192b25..e0e2d91 100644
--- a/src/galeon-popup.c
+++ b/src/galeon-popup.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-popup.h b/src/galeon-popup.h
index a4aaf7f..906fdb3 100644
--- a/src/galeon-popup.h
+++ b/src/galeon-popup.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_POPUP_H
diff --git a/src/galeon-recent-history-menu.c b/src/galeon-recent-history-menu.c
index 624d47d..40c12eb 100644
--- a/src/galeon-recent-history-menu.c
+++ b/src/galeon-recent-history-menu.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-recent-history-menu.h b/src/galeon-recent-history-menu.h
index 2620e13..12357dc 100644
--- a/src/galeon-recent-history-menu.h
+++ b/src/galeon-recent-history-menu.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_recent_history_menu_
diff --git a/src/galeon-session.c b/src/galeon-session.c
index af8cab1..35cb8ca 100644
--- a/src/galeon-session.c
+++ b/src/galeon-session.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "galeon-session.h"
diff --git a/src/galeon-session.h b/src/galeon-session.h
index 3e3f0ee..82fffaa 100644
--- a/src/galeon-session.h
+++ b/src/galeon-session.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef SESSION_H
diff --git a/src/galeon-shell.c b/src/galeon-shell.c
index ed0a7fb..3498a68 100644
--- a/src/galeon-shell.c
+++ b/src/galeon-shell.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "galeon-shell.h"
diff --git a/src/galeon-shell.h b/src/galeon-shell.h
index adef777..35ebc4a 100644
--- a/src/galeon-shell.h
+++ b/src/galeon-shell.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_SHELL_H
diff --git a/src/galeon-sidebar-embed.c b/src/galeon-sidebar-embed.c
index 754c013..5fe26b5 100644
--- a/src/galeon-sidebar-embed.c
+++ b/src/galeon-sidebar-embed.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/galeon-sidebar-embed.h b/src/galeon-sidebar-embed.h
index 3fa3b05..900bfa6 100644
--- a/src/galeon-sidebar-embed.h
+++ b/src/galeon-sidebar-embed.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/galeon-sidebars.c b/src/galeon-sidebars.c
index c15c664..ef93202 100644
--- a/src/galeon-sidebars.c
+++ b/src/galeon-sidebars.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-sidebars.h b/src/galeon-sidebars.h
index b932187..e83e256 100644
--- a/src/galeon-sidebars.h
+++ b/src/galeon-sidebars.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/src/galeon-simple-window.c b/src/galeon-simple-window.c
index 0a7a7aa..2d135c1 100644
--- a/src/galeon-simple-window.c
+++ b/src/galeon-simple-window.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-simple-window.h b/src/galeon-simple-window.h
index 0af0a43..b74edb0 100644
--- a/src/galeon-simple-window.h
+++ b/src/galeon-simple-window.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_simple_window_h_
diff --git a/src/galeon-tab-menu.c b/src/galeon-tab-menu.c
index 05d9eaa..e874045 100644
--- a/src/galeon-tab-menu.c
+++ b/src/galeon-tab-menu.c
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-tab-menu.h b/src/galeon-tab-menu.h
index db76f9b..be845b8 100644
--- a/src/galeon-tab-menu.h
+++ b/src/galeon-tab-menu.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_TAB_MENU_H
diff --git a/src/galeon-tab.c b/src/galeon-tab.c
index 292b259..b8dc242 100644
--- a/src/galeon-tab.c
+++ b/src/galeon-tab.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-tab.h b/src/galeon-tab.h
index b17e3f9..524d8d0 100644
--- a/src/galeon-tab.h
+++ b/src/galeon-tab.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_TAB_H
diff --git a/src/galeon-window-bookmark-activated-proxy.c b/src/galeon-window-bookmark-activated-proxy.c
index 899fe1c..cd9028a 100644
--- a/src/galeon-window-bookmark-activated-proxy.c
+++ b/src/galeon-window-bookmark-activated-proxy.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-window-bookmark-activated-proxy.h b/src/galeon-window-bookmark-activated-proxy.h
index 775847a..bfbc07c 100644
--- a/src/galeon-window-bookmark-activated-proxy.h
+++ b/src/galeon-window-bookmark-activated-proxy.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_window_bookmark_activated_proxy_h
diff --git a/src/galeon-window-menu.c b/src/galeon-window-menu.c
index a4757a8..75e9007 100644
--- a/src/galeon-window-menu.c
+++ b/src/galeon-window-menu.c
@@ -14,8 +14,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-window-menu.h b/src/galeon-window-menu.h
index 2092f29..ba4e792 100644
--- a/src/galeon-window-menu.h
+++ b/src/galeon-window-menu.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef _galeon_window_menu_h
diff --git a/src/galeon-window.c b/src/galeon-window.c
index 57a5b74..cbd1e60 100644
--- a/src/galeon-window.c
+++ b/src/galeon-window.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/galeon-window.h b/src/galeon-window.h
index b363a19..09f9a13 100644
--- a/src/galeon-window.h
+++ b/src/galeon-window.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_WINDOW_H
diff --git a/src/history-dialog.c b/src/history-dialog.c
old mode 100755
new mode 100644
index 8756749..3407ace
--- a/src/history-dialog.c
+++ b/src/history-dialog.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/history-dialog.h b/src/history-dialog.h
index 1c8d3df..e30c43c 100644
--- a/src/history-dialog.h
+++ b/src/history-dialog.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef HISTORY_DIALOG_H
diff --git a/src/migrate.c b/src/migrate.c
index f9085f0..5c2d138 100644
--- a/src/migrate.c
+++ b/src/migrate.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/migrate.h b/src/migrate.h
index e79c04c..e445eba 100644
--- a/src/migrate.h
+++ b/src/migrate.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef MIGRATE_H
diff --git a/src/page-info-dialog.c b/src/page-info-dialog.c
index 61a37ad..4d3778f 100644
--- a/src/page-info-dialog.c
+++ b/src/page-info-dialog.c
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/page-info-dialog.h b/src/page-info-dialog.h
index fd203ed..d40798f 100644
--- a/src/page-info-dialog.h
+++ b/src/page-info-dialog.h
@@ -15,8 +15,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PAGE_INFO_DIALOG_H
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c
old mode 100755
new mode 100644
index 0775c60..869a2e9
--- a/src/pdm-dialog.c
+++ b/src/pdm-dialog.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/pdm-dialog.h b/src/pdm-dialog.h
index e8a7f81..bac00cf 100644
--- a/src/pdm-dialog.h
+++ b/src/pdm-dialog.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PDM_DIALOG_H
diff --git a/src/popup-commands.c b/src/popup-commands.c
index 2db60aa..b361d33 100644
--- a/src/popup-commands.c
+++ b/src/popup-commands.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/popup-commands.h b/src/popup-commands.h
index e44c92a..ee6ea55 100644
--- a/src/popup-commands.h
+++ b/src/popup-commands.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "galeon-popup.h"
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c
old mode 100755
new mode 100644
index 012e7bc..f675128
--- a/src/ppview-toolbar.c
+++ b/src/ppview-toolbar.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
diff --git a/src/ppview-toolbar.h b/src/ppview-toolbar.h
index f0bfd3f..b9333e1 100644
--- a/src/ppview-toolbar.h
+++ b/src/ppview-toolbar.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PPVIEW_TOOLBAR_H
diff --git a/src/statusbar.c b/src/statusbar.c
old mode 100755
new mode 100644
index 8b9f24d..ecd0f35
--- a/src/statusbar.c
+++ b/src/statusbar.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/src/statusbar.h b/src/statusbar.h
index e93e069..30fa31a 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef STATUSBAR_H
diff --git a/src/window-commands.c b/src/window-commands.c
index eb4a69f..394e9f1 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/window-commands.h b/src/window-commands.h
index c74b5f6..09b079f 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "galeon-window.h"
diff --git a/src/window-recent-history.c b/src/window-recent-history.c
index 708d478..4c75484 100644
--- a/src/window-recent-history.c
+++ b/src/window-recent-history.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/window-recent-history.h b/src/window-recent-history.h
index 249803b..2d91fec 100644
--- a/src/window-recent-history.h
+++ b/src/window-recent-history.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __window_recent_history_h
diff --git a/utils/eel-gconf-extensions.c b/utils/eel-gconf-extensions.c
index ab23ed2..2365769 100644
--- a/utils/eel-gconf-extensions.c
+++ b/utils/eel-gconf-extensions.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ramiro Estrugo <ramiro eazel com>
 */
diff --git a/utils/eel-gconf-extensions.h b/utils/eel-gconf-extensions.h
index ef00454..a59c22b 100644
--- a/utils/eel-gconf-extensions.h
+++ b/utils/eel-gconf-extensions.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Authors: Ramiro Estrugo <ramiro eazel com>
 */
diff --git a/utils/galeon-auto-bookmarks-source.c b/utils/galeon-auto-bookmarks-source.c
index b38cbd5..ad83bbb 100644
--- a/utils/galeon-auto-bookmarks-source.c
+++ b/utils/galeon-auto-bookmarks-source.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/galeon-auto-bookmarks-source.h b/utils/galeon-auto-bookmarks-source.h
index c622c03..5fc45d5 100644
--- a/utils/galeon-auto-bookmarks-source.h
+++ b/utils/galeon-auto-bookmarks-source.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GALEON_AUTO_BOOKMARKS_SOURCE_H__
diff --git a/utils/galeon-autocompletion-source.c b/utils/galeon-autocompletion-source.c
index 46aeeab..c51120e 100644
--- a/utils/galeon-autocompletion-source.c
+++ b/utils/galeon-autocompletion-source.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/galeon-autocompletion-source.h b/utils/galeon-autocompletion-source.h
index e493ed8..3196c37 100644
--- a/utils/galeon-autocompletion-source.h
+++ b/utils/galeon-autocompletion-source.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GALEON_AUTOCOMPLETION_SOUCE_H__
diff --git a/utils/galeon-autocompletion-window.c b/utils/galeon-autocompletion-window.c
index 01abb99..3dc156a 100644
--- a/utils/galeon-autocompletion-window.c
+++ b/utils/galeon-autocompletion-window.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/galeon-autocompletion-window.h b/utils/galeon-autocompletion-window.h
index 775a0a2..52b8661 100644
--- a/utils/galeon-autocompletion-window.h
+++ b/utils/galeon-autocompletion-window.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_autocompletion_window_h_
diff --git a/utils/galeon-autocompletion.c b/utils/galeon-autocompletion.c
index 237c065..9e77866 100644
--- a/utils/galeon-autocompletion.c
+++ b/utils/galeon-autocompletion.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/galeon-autocompletion.h b/utils/galeon-autocompletion.h
index 23ca82f..c168357 100644
--- a/utils/galeon-autocompletion.h
+++ b/utils/galeon-autocompletion.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __galeon_autocompletion_h__
diff --git a/utils/galeon-debug.c b/utils/galeon-debug.c
index 19e1e45..962cb14 100644
--- a/utils/galeon-debug.c
+++ b/utils/galeon-debug.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "galeon-debug.h"
diff --git a/utils/galeon-debug.h b/utils/galeon-debug.h
index 0ad90a3..9edc3be 100644
--- a/utils/galeon-debug.h
+++ b/utils/galeon-debug.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/utils/galeon-dialog.c b/utils/galeon-dialog.c
index b20eaca..77edde1 100644
--- a/utils/galeon-dialog.c
+++ b/utils/galeon-dialog.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/galeon-dialog.h b/utils/galeon-dialog.h
index 23ed343..528c592 100644
--- a/utils/galeon-dialog.h
+++ b/utils/galeon-dialog.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_DIALOG_H
diff --git a/utils/galeon-dnd.c b/utils/galeon-dnd.c
index f5004c7..6107d30 100644
--- a/utils/galeon-dnd.c
+++ b/utils/galeon-dnd.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/galeon-dnd.h b/utils/galeon-dnd.h
index a36ae25..586408c 100644
--- a/utils/galeon-dnd.h
+++ b/utils/galeon-dnd.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/utils/galeon-sidebar.c b/utils/galeon-sidebar.c
index f72f8d3..5f31da7 100644
--- a/utils/galeon-sidebar.c
+++ b/utils/galeon-sidebar.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "galeon-sidebar.h"
diff --git a/utils/galeon-sidebar.h b/utils/galeon-sidebar.h
index eadbc75..ed124ac 100644
--- a/utils/galeon-sidebar.h
+++ b/utils/galeon-sidebar.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GALEON_SIDEBAR_H
diff --git a/utils/gul-download.c b/utils/gul-download.c
index fb842f4..2ca1f59 100644
--- a/utils/gul-download.c
+++ b/utils/gul-download.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/utils/gul-download.h b/utils/gul-download.h
index c2f3fe5..822641c 100644
--- a/utils/gul-download.h
+++ b/utils/gul-download.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef __cplusplus
diff --git a/utils/gul-ellipsizing-label.c b/utils/gul-ellipsizing-label.c
index 98c6955..48f7ea9 100644
--- a/utils/gul-ellipsizing-label.c
+++ b/utils/gul-ellipsizing-label.c
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: John Sullivan <sullivan eazel com>,
  */
diff --git a/utils/gul-ellipsizing-label.h b/utils/gul-ellipsizing-label.h
index 23cdbb7..517d6ae 100644
--- a/utils/gul-ellipsizing-label.h
+++ b/utils/gul-ellipsizing-label.h
@@ -16,8 +16,7 @@
 
    You should have received a copy of the GNU Library General Public
    License along with the Gnome Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.
+   see <http://www.gnu.org/licenses/>.
 
    Author: John Sullivan <sullivan eazel com>,
  */
diff --git a/utils/gul-file-chooser.c b/utils/gul-file-chooser.c
index 7aa66bd..c869b60 100644
--- a/utils/gul-file-chooser.c
+++ b/utils/gul-file-chooser.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/utils/gul-file-chooser.h b/utils/gul-file-chooser.h
index 0503d4f..b45da7e 100644
--- a/utils/gul-file-chooser.h
+++ b/utils/gul-file-chooser.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/utils/gul-file-preview.c b/utils/gul-file-preview.c
index 16725ee..974959e 100644
--- a/utils/gul-file-preview.c
+++ b/utils/gul-file-preview.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/utils/gul-file-preview.h b/utils/gul-file-preview.h
index ef23e5f..00b710a 100644
--- a/utils/gul-file-preview.h
+++ b/utils/gul-file-preview.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef GUL_FILE_PREVIEW_H
 #define GUL_FILE_PREVIEW_H 1
diff --git a/utils/gul-filesystem-autocompletion.c b/utils/gul-filesystem-autocompletion.c
index 7c95825..95cdcf8 100644
--- a/utils/gul-filesystem-autocompletion.c
+++ b/utils/gul-filesystem-autocompletion.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/gul-filesystem-autocompletion.h b/utils/gul-filesystem-autocompletion.h
index e3b6b60..62ca20e 100644
--- a/utils/gul-filesystem-autocompletion.h
+++ b/utils/gul-filesystem-autocompletion.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __gul_filesystem_autocompletion_h
diff --git a/utils/gul-general.c b/utils/gul-general.c
index 8c5b41f..d9ec34a 100644
--- a/utils/gul-general.c
+++ b/utils/gul-general.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Galeon includes */
diff --git a/utils/gul-general.h b/utils/gul-general.h
index d137af5..a670252 100644
--- a/utils/gul-general.h
+++ b/utils/gul-general.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __MISC_GENERAL_H
diff --git a/utils/gul-gestures.c b/utils/gul-gestures.c
index 908601e..89fb6df 100644
--- a/utils/gul-gestures.c
+++ b/utils/gul-gestures.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* this file is based on work of Daniel Erat for galeon 1 */
diff --git a/utils/gul-gestures.h b/utils/gul-gestures.h
index fa0d7ed..c5782b0 100644
--- a/utils/gul-gestures.h
+++ b/utils/gul-gestures.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __gul_gestures_h
diff --git a/utils/gul-glade.c b/utils/gul-glade.c
index d9a63cc..bf7c923 100644
--- a/utils/gul-glade.c
+++ b/utils/gul-glade.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/gul-glade.h b/utils/gul-glade.h
index 21a031f..5fe64ca 100644
--- a/utils/gul-glade.h
+++ b/utils/gul-glade.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUL_GLADE_H
diff --git a/utils/gul-gui.c b/utils/gul-gui.c
index 1384210..64e75fe 100644
--- a/utils/gul-gui.c
+++ b/utils/gul-gui.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/utils/gul-gui.h b/utils/gul-gui.h
index 131cb01..232fd78 100644
--- a/utils/gul-gui.h
+++ b/utils/gul-gui.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUL_GUI_H
diff --git a/utils/gul-iso-codes.c b/utils/gul-iso-codes.c
index 62a7b22..ab5cd94 100644
--- a/utils/gul-iso-codes.c
+++ b/utils/gul-iso-codes.c
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 
diff --git a/utils/gul-iso-codes.h b/utils/gul-iso-codes.h
index 394dae5..5887e5a 100644
--- a/utils/gul-iso-codes.h
+++ b/utils/gul-iso-codes.h
@@ -13,8 +13,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUL_ISO_CODES_H
diff --git a/utils/gul-notebook.c b/utils/gul-notebook.c
index 2fa173a..fefba83 100644
--- a/utils/gul-notebook.c
+++ b/utils/gul-notebook.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/utils/gul-notebook.h b/utils/gul-notebook.h
index 14df479..6f2bfd5 100644
--- a/utils/gul-notebook.h
+++ b/utils/gul-notebook.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUL_NOTEBOOK_H
diff --git a/utils/gul-prefs-utils.c b/utils/gul-prefs-utils.c
index bce85e8..07938ed 100644
--- a/utils/gul-prefs-utils.c
+++ b/utils/gul-prefs-utils.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/gul-prefs-utils.h b/utils/gul-prefs-utils.h
index 3d56767..edb4e56 100644
--- a/utils/gul-prefs-utils.h
+++ b/utils/gul-prefs-utils.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtkwidget.h>
diff --git a/utils/gul-state.c b/utils/gul-state.c
index 621b6b5..b0eaeda 100644
--- a/utils/gul-state.c
+++ b/utils/gul-state.c
@@ -11,8 +11,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *
  */
 #include "config.h"
diff --git a/utils/gul-state.h b/utils/gul-state.h
index dd98cab..247892e 100644
--- a/utils/gul-state.h
+++ b/utils/gul-state.h
@@ -11,8 +11,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  *  
  */
 
diff --git a/utils/gul-string.c b/utils/gul-string.c
index 08fc9cb..83e7ed4 100644
--- a/utils/gul-string.c
+++ b/utils/gul-string.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/utils/gul-string.h b/utils/gul-string.h
index d40208c..c01bbeb 100644
--- a/utils/gul-string.h
+++ b/utils/gul-string.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUL_STRING_H
diff --git a/utils/gul-toolbutton.c b/utils/gul-toolbutton.c
index 104246f..975bc1f 100644
--- a/utils/gul-toolbutton.c
+++ b/utils/gul-toolbutton.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/gul-toolbutton.h b/utils/gul-toolbutton.h
index 9e24434..77169c2 100644
--- a/utils/gul-toolbutton.h
+++ b/utils/gul-toolbutton.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __gul_toolbutton_h_
diff --git a/utils/gul-x11.c b/utils/gul-x11.c
index 7ab9fdd..f4dc965 100644
--- a/utils/gul-x11.c
+++ b/utils/gul-x11.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/utils/gul-x11.h b/utils/gul-x11.h
index 00e2994..36a9440 100644
--- a/utils/gul-x11.h
+++ b/utils/gul-x11.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef GUL_X11_H
diff --git a/utils/location-entry.c b/utils/location-entry.c
index f8fda73..9ba8ae2 100644
--- a/utils/location-entry.c
+++ b/utils/location-entry.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/utils/location-entry.h b/utils/location-entry.h
index db242f8..2b1967e 100644
--- a/utils/location-entry.h
+++ b/utils/location-entry.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __location_entry_h
diff --git a/utils/pixbuf-cache.c b/utils/pixbuf-cache.c
index 434bde9..ff55f0a 100644
--- a/utils/pixbuf-cache.c
+++ b/utils/pixbuf-cache.c
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef HAVE_CONFIG_H
diff --git a/utils/pixbuf-cache.h b/utils/pixbuf-cache.h
index b2e5649..3694d9d 100644
--- a/utils/pixbuf-cache.h
+++ b/utils/pixbuf-cache.h
@@ -12,8 +12,7 @@
  *  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.
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 G_BEGIN_DECLS