[giggle] Update FSF Address

[Javier JardÃn <jjardon src gnome org>]

commit a9ea21bbaf30e52e5b4464409df913d248ce27b8
Author: Javier JardÃn <jjardon gnome org>
Date:   Mon Feb 27 11:56:56 2012 +0000

    Update FSF Address

 COPYING                                  |   41 ++++++++++++++---------------
 libgiggle-git/giggle-git-add-ref.c       |    6 +---
 libgiggle-git/giggle-git-add-ref.h       |    6 +---
 libgiggle-git/giggle-git-add.c           |    6 +---
 libgiggle-git/giggle-git-add.h           |    6 +---
 libgiggle-git/giggle-git-authors.c       |    6 +---
 libgiggle-git/giggle-git-authors.h       |    6 +---
 libgiggle-git/giggle-git-blame.c         |    6 +---
 libgiggle-git/giggle-git-blame.h         |    6 +---
 libgiggle-git/giggle-git-cat-file.c      |    6 +---
 libgiggle-git/giggle-git-cat-file.h      |    6 +---
 libgiggle-git/giggle-git-clone.c         |    6 +---
 libgiggle-git/giggle-git-clone.h         |    6 +---
 libgiggle-git/giggle-git-commit.c        |    6 +---
 libgiggle-git/giggle-git-commit.h        |    6 +---
 libgiggle-git/giggle-git-config-read.c   |    6 +---
 libgiggle-git/giggle-git-config-read.h   |    6 +---
 libgiggle-git/giggle-git-config-write.c  |    6 +---
 libgiggle-git/giggle-git-config-write.h  |    6 +---
 libgiggle-git/giggle-git-config.c        |    6 +---
 libgiggle-git/giggle-git-config.h        |    6 +---
 libgiggle-git/giggle-git-delete-ref.c    |    6 +---
 libgiggle-git/giggle-git-delete-ref.h    |    6 +---
 libgiggle-git/giggle-git-diff-tree.c     |    6 +---
 libgiggle-git/giggle-git-diff-tree.h     |    6 +---
 libgiggle-git/giggle-git-diff.c          |    6 +---
 libgiggle-git/giggle-git-diff.h          |    6 +---
 libgiggle-git/giggle-git-ignore.c        |    6 +---
 libgiggle-git/giggle-git-ignore.h        |    6 +---
 libgiggle-git/giggle-git-list-files.c    |    6 +---
 libgiggle-git/giggle-git-list-files.h    |    6 +---
 libgiggle-git/giggle-git-list-tree.c     |    6 +---
 libgiggle-git/giggle-git-list-tree.h     |    6 +---
 libgiggle-git/giggle-git-log.c           |    6 +---
 libgiggle-git/giggle-git-log.h           |    6 +---
 libgiggle-git/giggle-git-refs.c          |    6 +---
 libgiggle-git/giggle-git-refs.h          |    6 +---
 libgiggle-git/giggle-git-remote-list.c   |    6 +---
 libgiggle-git/giggle-git-remote-list.h   |    6 +---
 libgiggle-git/giggle-git-revisions.c     |    6 +---
 libgiggle-git/giggle-git-revisions.h     |    6 +---
 libgiggle-git/giggle-git.c               |    6 +---
 libgiggle-git/giggle-git.h               |    6 +---
 libgiggle/giggle-author.c                |    6 +---
 libgiggle/giggle-author.h                |    6 +---
 libgiggle/giggle-branch.c                |    6 +---
 libgiggle/giggle-branch.h                |    6 +---
 libgiggle/giggle-clipboard.c             |    6 +---
 libgiggle/giggle-clipboard.h             |    6 +---
 libgiggle/giggle-dispatcher.c            |    6 +---
 libgiggle/giggle-dispatcher.h            |    6 +---
 libgiggle/giggle-dummy.c                 |    6 +---
 libgiggle/giggle-dummy.h                 |    6 +---
 libgiggle/giggle-error.c                 |    6 +---
 libgiggle/giggle-error.h                 |    6 +---
 libgiggle/giggle-history.c               |    6 +---
 libgiggle/giggle-history.h               |    6 +---
 libgiggle/giggle-job.c                   |    6 +---
 libgiggle/giggle-job.h                   |    6 +---
 libgiggle/giggle-plugin-manager.c        |    6 +---
 libgiggle/giggle-plugin-manager.h        |    6 +---
 libgiggle/giggle-plugin.c                |    6 +---
 libgiggle/giggle-plugin.h                |    6 +---
 libgiggle/giggle-ref.c                   |    6 +---
 libgiggle/giggle-ref.h                   |    6 +---
 libgiggle/giggle-remote-branch.c         |    6 +---
 libgiggle/giggle-remote-branch.h         |    6 +---
 libgiggle/giggle-remote-ref.c            |    6 +---
 libgiggle/giggle-remote-ref.h            |    6 +---
 libgiggle/giggle-remote.c                |    6 +---
 libgiggle/giggle-remote.h                |    6 +---
 libgiggle/giggle-revision.c              |    6 +---
 libgiggle/giggle-revision.h              |    6 +---
 libgiggle/giggle-searchable.c            |    6 +---
 libgiggle/giggle-searchable.h            |    6 +---
 libgiggle/giggle-sysdeps.c               |    6 +---
 libgiggle/giggle-sysdeps.h               |    6 +---
 libgiggle/giggle-tag.c                   |    6 +---
 libgiggle/giggle-tag.h                   |    6 +---
 libgiggle/giggle-view-shell.c            |    6 +---
 libgiggle/giggle-view-shell.h            |    6 +---
 libgiggle/giggle-view.c                  |    6 +---
 libgiggle/giggle-view.h                  |    6 +---
 plugins/giggle-hello-world-plugin.c      |    6 +---
 plugins/giggle-personal-details-plugin.c |    6 +---
 plugins/giggle-personal-details-window.c |    6 +---
 plugins/giggle-personal-details-window.h |    6 +---
 plugins/giggle-view-terminal-plugin.c    |    6 +---
 plugins/giggle-view-terminal.c           |    6 +---
 plugins/giggle-view-terminal.h           |    6 +---
 src/eggfindbar.c                         |    6 +---
 src/eggfindbar.h                         |    7 +---
 src/giggle-authors-view.c                |    6 +---
 src/giggle-authors-view.h                |    6 +---
 src/giggle-avatar-cache.c                |    6 +---
 src/giggle-avatar-cache.h                |    6 +---
 src/giggle-avatar-image.c                |    6 +---
 src/giggle-avatar-image.h                |    6 +---
 src/giggle-branches-view.c               |    6 +---
 src/giggle-branches-view.h               |    6 +---
 src/giggle-clone-dialog.c                |    2 +-
 src/giggle-clone-dialog.h                |    2 +-
 src/giggle-description-editor.c          |    6 +---
 src/giggle-description-editor.h          |    6 +---
 src/giggle-diff-tree-view.c              |    6 +---
 src/giggle-diff-tree-view.h              |    6 +---
 src/giggle-diff-view.c                   |    6 +---
 src/giggle-diff-view.h                   |    6 +---
 src/giggle-diff-window.c                 |    6 +---
 src/giggle-diff-window.h                 |    6 +---
 src/giggle-file-list.c                   |    6 +---
 src/giggle-file-list.h                   |    6 +---
 src/giggle-graph-renderer.c              |    6 +---
 src/giggle-graph-renderer.h              |    6 +---
 src/giggle-helpers.c                     |    6 +---
 src/giggle-helpers.h                     |    6 +---
 src/giggle-input-dialog.c                |    6 +---
 src/giggle-input-dialog.h                |    6 +---
 src/giggle-label-action.c                |    6 +---
 src/giggle-label-action.h                |    6 +---
 src/giggle-main.c                        |    6 +---
 src/giggle-remote-editor.c               |    6 +---
 src/giggle-remote-editor.h               |    6 +---
 src/giggle-remotes-view.c                |    6 +---
 src/giggle-remotes-view.h                |    6 +---
 src/giggle-rev-list-view.c               |    6 +---
 src/giggle-rev-list-view.h               |    6 +---
 src/giggle-revision-info-action.c        |    6 +---
 src/giggle-revision-info-action.h        |    6 +---
 src/giggle-revision-info.c               |    6 +---
 src/giggle-revision-info.h               |    6 +---
 src/giggle-revision-view.c               |    6 +---
 src/giggle-revision-view.h               |    6 +---
 src/giggle-short-list.c                  |    6 +---
 src/giggle-short-list.h                  |    6 +---
 src/giggle-spaning-renderer.c            |    6 +---
 src/giggle-spaning-renderer.h            |    6 +---
 src/giggle-view-diff.c                   |    6 +---
 src/giggle-view-diff.h                   |    6 +---
 src/giggle-view-file.c                   |    6 +---
 src/giggle-view-file.h                   |    6 +---
 src/giggle-view-history.c                |    6 +---
 src/giggle-view-history.h                |    6 +---
 src/giggle-view-summary.c                |    6 +---
 src/giggle-view-summary.h                |    6 +---
 src/giggle-window.c                      |    6 +---
 src/giggle-window.h                      |    6 +---
 src/test-patch-view.c                    |    6 +---
 148 files changed, 312 insertions(+), 604 deletions(-)
---
diff --git a/COPYING b/COPYING
index d60c31a..d159169 100644
--- a/COPYING
+++ b/COPYING
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/libgiggle-git/giggle-git-add-ref.c b/libgiggle-git/giggle-git-add-ref.c
index 77c0eac..df84f4c 100644
--- a/libgiggle-git/giggle-git-add-ref.c
+++ b/libgiggle-git/giggle-git-add-ref.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-add-ref.h b/libgiggle-git/giggle-git-add-ref.h
index 9fdf5da..eba452e 100644
--- a/libgiggle-git/giggle-git-add-ref.h
+++ b/libgiggle-git/giggle-git-add-ref.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_ADD_REF_H__
diff --git a/libgiggle-git/giggle-git-add.c b/libgiggle-git/giggle-git-add.c
index e67053f..739e9e4 100644
--- a/libgiggle-git/giggle-git-add.c
+++ b/libgiggle-git/giggle-git-add.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-add.h b/libgiggle-git/giggle-git-add.h
index 38ee6e7..84d621b 100644
--- a/libgiggle-git/giggle-git-add.h
+++ b/libgiggle-git/giggle-git-add.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_ADD_H__
diff --git a/libgiggle-git/giggle-git-authors.c b/libgiggle-git/giggle-git-authors.c
index e671f8c..478ca00 100644
--- a/libgiggle-git/giggle-git-authors.c
+++ b/libgiggle-git/giggle-git-authors.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-authors.h b/libgiggle-git/giggle-git-authors.h
index 91d01a3..f200fcd 100644
--- a/libgiggle-git/giggle-git-authors.h
+++ b/libgiggle-git/giggle-git-authors.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_AUTHORS_H__
diff --git a/libgiggle-git/giggle-git-blame.c b/libgiggle-git/giggle-git-blame.c
index 666e879..c59d037 100644
--- a/libgiggle-git/giggle-git-blame.c
+++ b/libgiggle-git/giggle-git-blame.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-blame.h b/libgiggle-git/giggle-git-blame.h
index 24c04be..5ab4f4a 100644
--- a/libgiggle-git/giggle-git-blame.h
+++ b/libgiggle-git/giggle-git-blame.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_BLAME_H__
diff --git a/libgiggle-git/giggle-git-cat-file.c b/libgiggle-git/giggle-git-cat-file.c
index 30ad2e3..8a2905e 100644
--- a/libgiggle-git/giggle-git-cat-file.c
+++ b/libgiggle-git/giggle-git-cat-file.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-cat-file.h b/libgiggle-git/giggle-git-cat-file.h
index 79898a5..bec5257 100644
--- a/libgiggle-git/giggle-git-cat-file.h
+++ b/libgiggle-git/giggle-git-cat-file.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_CAT_FILE_H__
diff --git a/libgiggle-git/giggle-git-clone.c b/libgiggle-git/giggle-git-clone.c
index 2c9ed85..460d4ac 100644
--- a/libgiggle-git/giggle-git-clone.c
+++ b/libgiggle-git/giggle-git-clone.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-clone.h b/libgiggle-git/giggle-git-clone.h
index 29dce10..402b578 100644
--- a/libgiggle-git/giggle-git-clone.h
+++ b/libgiggle-git/giggle-git-clone.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_CLONE_H__
diff --git a/libgiggle-git/giggle-git-commit.c b/libgiggle-git/giggle-git-commit.c
index 06adb65..b67c985 100644
--- a/libgiggle-git/giggle-git-commit.c
+++ b/libgiggle-git/giggle-git-commit.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-commit.h b/libgiggle-git/giggle-git-commit.h
index da309e4..41b886f 100644
--- a/libgiggle-git/giggle-git-commit.h
+++ b/libgiggle-git/giggle-git-commit.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_COMMIT_H__
diff --git a/libgiggle-git/giggle-git-config-read.c b/libgiggle-git/giggle-git-config-read.c
index 33dcb87..7b4fdb9 100644
--- a/libgiggle-git/giggle-git-config-read.c
+++ b/libgiggle-git/giggle-git-config-read.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-config-read.h b/libgiggle-git/giggle-git-config-read.h
index 7f7a952..eca8506 100644
--- a/libgiggle-git/giggle-git-config-read.h
+++ b/libgiggle-git/giggle-git-config-read.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_CONFIG_READ_H__
diff --git a/libgiggle-git/giggle-git-config-write.c b/libgiggle-git/giggle-git-config-write.c
index d9cc03c..e026e4f 100644
--- a/libgiggle-git/giggle-git-config-write.c
+++ b/libgiggle-git/giggle-git-config-write.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-config-write.h b/libgiggle-git/giggle-git-config-write.h
index e5e0aa9..dc73dbf 100644
--- a/libgiggle-git/giggle-git-config-write.h
+++ b/libgiggle-git/giggle-git-config-write.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_CONFIG_WRITE_H__
diff --git a/libgiggle-git/giggle-git-config.c b/libgiggle-git/giggle-git-config.c
index 54dcbfb..dbef0d4 100644
--- a/libgiggle-git/giggle-git-config.c
+++ b/libgiggle-git/giggle-git-config.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-config.h b/libgiggle-git/giggle-git-config.h
index 54ecf0a..15ee6d2 100644
--- a/libgiggle-git/giggle-git-config.h
+++ b/libgiggle-git/giggle-git-config.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_CONFIG_H__
diff --git a/libgiggle-git/giggle-git-delete-ref.c b/libgiggle-git/giggle-git-delete-ref.c
index e3745b9..72e62e1 100644
--- a/libgiggle-git/giggle-git-delete-ref.c
+++ b/libgiggle-git/giggle-git-delete-ref.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-delete-ref.h b/libgiggle-git/giggle-git-delete-ref.h
index c3787d2..425a87a 100644
--- a/libgiggle-git/giggle-git-delete-ref.h
+++ b/libgiggle-git/giggle-git-delete-ref.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_DELETE_REF_H__
diff --git a/libgiggle-git/giggle-git-diff-tree.c b/libgiggle-git/giggle-git-diff-tree.c
index f9313ce..b4a154a 100644
--- a/libgiggle-git/giggle-git-diff-tree.c
+++ b/libgiggle-git/giggle-git-diff-tree.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-diff-tree.h b/libgiggle-git/giggle-git-diff-tree.h
index 4bad411..392254e 100644
--- a/libgiggle-git/giggle-git-diff-tree.h
+++ b/libgiggle-git/giggle-git-diff-tree.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_DIFF_TREE_H__
diff --git a/libgiggle-git/giggle-git-diff.c b/libgiggle-git/giggle-git-diff.c
index 3112cf8..90a3289 100644
--- a/libgiggle-git/giggle-git-diff.c
+++ b/libgiggle-git/giggle-git-diff.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-diff.h b/libgiggle-git/giggle-git-diff.h
index 07ecb7b..042fd43 100644
--- a/libgiggle-git/giggle-git-diff.h
+++ b/libgiggle-git/giggle-git-diff.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_DIFF_H__
diff --git a/libgiggle-git/giggle-git-ignore.c b/libgiggle-git/giggle-git-ignore.c
index d85a023..6e2dc65 100644
--- a/libgiggle-git/giggle-git-ignore.c
+++ b/libgiggle-git/giggle-git-ignore.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-ignore.h b/libgiggle-git/giggle-git-ignore.h
index 3acea59..bb6f793 100644
--- a/libgiggle-git/giggle-git-ignore.h
+++ b/libgiggle-git/giggle-git-ignore.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_IGNORE_H__
diff --git a/libgiggle-git/giggle-git-list-files.c b/libgiggle-git/giggle-git-list-files.c
index 6a11610..79c3a89 100644
--- a/libgiggle-git/giggle-git-list-files.c
+++ b/libgiggle-git/giggle-git-list-files.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-list-files.h b/libgiggle-git/giggle-git-list-files.h
index 64141c6..640ede5 100644
--- a/libgiggle-git/giggle-git-list-files.h
+++ b/libgiggle-git/giggle-git-list-files.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_LIST_FILES_H__
diff --git a/libgiggle-git/giggle-git-list-tree.c b/libgiggle-git/giggle-git-list-tree.c
index 9bb3500..5468c02 100644
--- a/libgiggle-git/giggle-git-list-tree.c
+++ b/libgiggle-git/giggle-git-list-tree.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-list-tree.h b/libgiggle-git/giggle-git-list-tree.h
index 762a161..eb03e33 100644
--- a/libgiggle-git/giggle-git-list-tree.h
+++ b/libgiggle-git/giggle-git-list-tree.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_LIST_TREE_H__
diff --git a/libgiggle-git/giggle-git-log.c b/libgiggle-git/giggle-git-log.c
index 041253b..e6dba1b 100644
--- a/libgiggle-git/giggle-git-log.c
+++ b/libgiggle-git/giggle-git-log.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-log.h b/libgiggle-git/giggle-git-log.h
index 5cd25a3..3e050f9 100644
--- a/libgiggle-git/giggle-git-log.h
+++ b/libgiggle-git/giggle-git-log.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_LOG_H__
diff --git a/libgiggle-git/giggle-git-refs.c b/libgiggle-git/giggle-git-refs.c
index 4db9cc5..f597a20 100644
--- a/libgiggle-git/giggle-git-refs.c
+++ b/libgiggle-git/giggle-git-refs.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-refs.h b/libgiggle-git/giggle-git-refs.h
index 8e4a7d0..fe727b1 100644
--- a/libgiggle-git/giggle-git-refs.h
+++ b/libgiggle-git/giggle-git-refs.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_REFS_H__
diff --git a/libgiggle-git/giggle-git-remote-list.c b/libgiggle-git/giggle-git-remote-list.c
index b42ec3a..40d6f18 100644
--- a/libgiggle-git/giggle-git-remote-list.c
+++ b/libgiggle-git/giggle-git-remote-list.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-remote-list.h b/libgiggle-git/giggle-git-remote-list.h
index 0869b03..a35b7ce 100644
--- a/libgiggle-git/giggle-git-remote-list.h
+++ b/libgiggle-git/giggle-git-remote-list.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_REMOTE_LIST_H__
diff --git a/libgiggle-git/giggle-git-revisions.c b/libgiggle-git/giggle-git-revisions.c
index 7b53c99..d074d5c 100644
--- a/libgiggle-git/giggle-git-revisions.c
+++ b/libgiggle-git/giggle-git-revisions.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git-revisions.h b/libgiggle-git/giggle-git-revisions.h
index 8b9f306..ea0f3c5 100644
--- a/libgiggle-git/giggle-git-revisions.h
+++ b/libgiggle-git/giggle-git-revisions.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_REVISIONS_H__
diff --git a/libgiggle-git/giggle-git.c b/libgiggle-git/giggle-git.c
index 2c22bce..37e42cc 100644
--- a/libgiggle-git/giggle-git.c
+++ b/libgiggle-git/giggle-git.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle-git/giggle-git.h b/libgiggle-git/giggle-git.h
index 5db4175..4575e02 100644
--- a/libgiggle-git/giggle-git.h
+++ b/libgiggle-git/giggle-git.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GIT_H__
diff --git a/libgiggle/giggle-author.c b/libgiggle/giggle-author.c
index e70f9e4..1b8bb82 100644
--- a/libgiggle/giggle-author.c
+++ b/libgiggle/giggle-author.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle/giggle-author.h b/libgiggle/giggle-author.h
index 8e6f930..39f0e2a 100644
--- a/libgiggle/giggle-author.h
+++ b/libgiggle/giggle-author.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_AUTHOR_H__
diff --git a/libgiggle/giggle-branch.c b/libgiggle/giggle-branch.c
index 12e2e86..164b6b5 100644
--- a/libgiggle/giggle-branch.c
+++ b/libgiggle/giggle-branch.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-branch.h b/libgiggle/giggle-branch.h
index 3650075..0c88d28 100644
--- a/libgiggle/giggle-branch.h
+++ b/libgiggle/giggle-branch.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_BRANCH_H__
diff --git a/libgiggle/giggle-clipboard.c b/libgiggle/giggle-clipboard.c
index f7e34a5..95fdcb9 100644
--- a/libgiggle/giggle-clipboard.c
+++ b/libgiggle/giggle-clipboard.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "giggle-clipboard.h"
diff --git a/libgiggle/giggle-clipboard.h b/libgiggle/giggle-clipboard.h
index dd06106..a9452d9 100644
--- a/libgiggle/giggle-clipboard.h
+++ b/libgiggle/giggle-clipboard.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_CLIPBOARD_H__
diff --git a/libgiggle/giggle-dispatcher.c b/libgiggle/giggle-dispatcher.c
index bc3d691..365a5a6 100644
--- a/libgiggle/giggle-dispatcher.c
+++ b/libgiggle/giggle-dispatcher.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-dispatcher.h b/libgiggle/giggle-dispatcher.h
index 59a63f3..d55d638 100644
--- a/libgiggle/giggle-dispatcher.h
+++ b/libgiggle/giggle-dispatcher.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_DISPATCHER_H__
diff --git a/libgiggle/giggle-dummy.c b/libgiggle/giggle-dummy.c
index 4973ced..fa2b60f 100644
--- a/libgiggle/giggle-dummy.c
+++ b/libgiggle/giggle-dummy.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-dummy.h b/libgiggle/giggle-dummy.h
index 939c7a6..0d4b9d7 100644
--- a/libgiggle/giggle-dummy.h
+++ b/libgiggle/giggle-dummy.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_DUMMY_H__
diff --git a/libgiggle/giggle-error.c b/libgiggle/giggle-error.c
index f40ae21..07611a8 100644
--- a/libgiggle/giggle-error.c
+++ b/libgiggle/giggle-error.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-error.h b/libgiggle/giggle-error.h
index 2b60284..e4e5915 100644
--- a/libgiggle/giggle-error.h
+++ b/libgiggle/giggle-error.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_ERROR_H__
diff --git a/libgiggle/giggle-history.c b/libgiggle/giggle-history.c
index 70e0281..07e8501 100644
--- a/libgiggle/giggle-history.c
+++ b/libgiggle/giggle-history.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "giggle-history.h"
diff --git a/libgiggle/giggle-history.h b/libgiggle/giggle-history.h
index 890c971..1392a50 100644
--- a/libgiggle/giggle-history.h
+++ b/libgiggle/giggle-history.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_HISTORY_H__
diff --git a/libgiggle/giggle-job.c b/libgiggle/giggle-job.c
index c1d2b8a..4e622df 100644
--- a/libgiggle/giggle-job.c
+++ b/libgiggle/giggle-job.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-job.h b/libgiggle/giggle-job.h
index ce5e0a4..f4d1d78 100644
--- a/libgiggle/giggle-job.h
+++ b/libgiggle/giggle-job.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_JOB_H__
diff --git a/libgiggle/giggle-plugin-manager.c b/libgiggle/giggle-plugin-manager.c
index 109368e..b61f3fa 100644
--- a/libgiggle/giggle-plugin-manager.c
+++ b/libgiggle/giggle-plugin-manager.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle/giggle-plugin-manager.h b/libgiggle/giggle-plugin-manager.h
index 65ad635..2ef02e4 100644
--- a/libgiggle/giggle-plugin-manager.h
+++ b/libgiggle/giggle-plugin-manager.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_PLUGIN_MANAGER_H__
diff --git a/libgiggle/giggle-plugin.c b/libgiggle/giggle-plugin.c
index 1c43e75..213368b 100644
--- a/libgiggle/giggle-plugin.c
+++ b/libgiggle/giggle-plugin.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle/giggle-plugin.h b/libgiggle/giggle-plugin.h
index cccf42d..8a7cfea 100644
--- a/libgiggle/giggle-plugin.h
+++ b/libgiggle/giggle-plugin.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_PLUGIN_H__
diff --git a/libgiggle/giggle-ref.c b/libgiggle/giggle-ref.c
index 4a6018e..5396594 100644
--- a/libgiggle/giggle-ref.c
+++ b/libgiggle/giggle-ref.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-ref.h b/libgiggle/giggle-ref.h
index ab5911f..214069e 100644
--- a/libgiggle/giggle-ref.h
+++ b/libgiggle/giggle-ref.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REF_H__
diff --git a/libgiggle/giggle-remote-branch.c b/libgiggle/giggle-remote-branch.c
index 8dfe6da..1a0b050 100644
--- a/libgiggle/giggle-remote-branch.c
+++ b/libgiggle/giggle-remote-branch.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-remote-branch.h b/libgiggle/giggle-remote-branch.h
index 51a3b70..92211b0 100644
--- a/libgiggle/giggle-remote-branch.h
+++ b/libgiggle/giggle-remote-branch.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REMOTE_BRANCH_H__
diff --git a/libgiggle/giggle-remote-ref.c b/libgiggle/giggle-remote-ref.c
index 8bdba45..0c338f8 100644
--- a/libgiggle/giggle-remote-ref.c
+++ b/libgiggle/giggle-remote-ref.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-remote-ref.h b/libgiggle/giggle-remote-ref.h
index 59836bf..b224852 100644
--- a/libgiggle/giggle-remote-ref.h
+++ b/libgiggle/giggle-remote-ref.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REMOTE_REF_H__
diff --git a/libgiggle/giggle-remote.c b/libgiggle/giggle-remote.c
index 383744b..40b0aa2 100644
--- a/libgiggle/giggle-remote.c
+++ b/libgiggle/giggle-remote.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <glib.h>
diff --git a/libgiggle/giggle-remote.h b/libgiggle/giggle-remote.h
index 5d11c0d..3a7e76a 100644
--- a/libgiggle/giggle-remote.h
+++ b/libgiggle/giggle-remote.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REMOTE_H__
diff --git a/libgiggle/giggle-revision.c b/libgiggle/giggle-revision.c
index b829291..1e2a0a6 100644
--- a/libgiggle/giggle-revision.c
+++ b/libgiggle/giggle-revision.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle/giggle-revision.h b/libgiggle/giggle-revision.h
index a9790a4..a01141f 100644
--- a/libgiggle/giggle-revision.h
+++ b/libgiggle/giggle-revision.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REVISION_H__
diff --git a/libgiggle/giggle-searchable.c b/libgiggle/giggle-searchable.c
index 019302a..d57c7ae 100644
--- a/libgiggle/giggle-searchable.c
+++ b/libgiggle/giggle-searchable.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "giggle-searchable.h"
diff --git a/libgiggle/giggle-searchable.h b/libgiggle/giggle-searchable.h
index bd2aa95..00a5b56 100644
--- a/libgiggle/giggle-searchable.h
+++ b/libgiggle/giggle-searchable.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_SEARCHABLE_H__
diff --git a/libgiggle/giggle-sysdeps.c b/libgiggle/giggle-sysdeps.c
index ac9ec39..98bf7bd 100644
--- a/libgiggle/giggle-sysdeps.c
+++ b/libgiggle/giggle-sysdeps.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-sysdeps.h b/libgiggle/giggle-sysdeps.h
index 2935712..842cd12 100644
--- a/libgiggle/giggle-sysdeps.h
+++ b/libgiggle/giggle-sysdeps.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_SYSDEPS_H__
diff --git a/libgiggle/giggle-tag.c b/libgiggle/giggle-tag.c
index f322ec7..db137cf 100644
--- a/libgiggle/giggle-tag.c
+++ b/libgiggle/giggle-tag.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-tag.h b/libgiggle/giggle-tag.h
index eb6eb02..38db5d1 100644
--- a/libgiggle/giggle-tag.h
+++ b/libgiggle/giggle-tag.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_TAG_H__
diff --git a/libgiggle/giggle-view-shell.c b/libgiggle/giggle-view-shell.c
index d032812..589ec2f 100644
--- a/libgiggle/giggle-view-shell.c
+++ b/libgiggle/giggle-view-shell.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/libgiggle/giggle-view-shell.h b/libgiggle/giggle-view-shell.h
index f18bde6..951a553 100644
--- a/libgiggle/giggle-view-shell.h
+++ b/libgiggle/giggle-view-shell.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_SHELL_H__
diff --git a/libgiggle/giggle-view.c b/libgiggle/giggle-view.c
index 3a49be6..1e6976a 100644
--- a/libgiggle/giggle-view.c
+++ b/libgiggle/giggle-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/libgiggle/giggle-view.h b/libgiggle/giggle-view.h
index d14f1db..98f2a5c 100644
--- a/libgiggle/giggle-view.h
+++ b/libgiggle/giggle-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_H__
diff --git a/plugins/giggle-hello-world-plugin.c b/plugins/giggle-hello-world-plugin.c
index c130747..62805e4 100644
--- a/plugins/giggle-hello-world-plugin.c
+++ b/plugins/giggle-hello-world-plugin.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/plugins/giggle-personal-details-plugin.c b/plugins/giggle-personal-details-plugin.c
index 132407c..2eb7eb8 100644
--- a/plugins/giggle-personal-details-plugin.c
+++ b/plugins/giggle-personal-details-plugin.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/plugins/giggle-personal-details-window.c b/plugins/giggle-personal-details-window.c
index acfce27..37a8698 100644
--- a/plugins/giggle-personal-details-window.c
+++ b/plugins/giggle-personal-details-window.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/plugins/giggle-personal-details-window.h b/plugins/giggle-personal-details-window.h
index cfec8d5..65cca75 100644
--- a/plugins/giggle-personal-details-window.h
+++ b/plugins/giggle-personal-details-window.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_PERSONAL_DETAILS_WINDOW_H__
diff --git a/plugins/giggle-view-terminal-plugin.c b/plugins/giggle-view-terminal-plugin.c
index 17c33a3..400c5e5 100644
--- a/plugins/giggle-view-terminal-plugin.c
+++ b/plugins/giggle-view-terminal-plugin.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/plugins/giggle-view-terminal.c b/plugins/giggle-view-terminal.c
index 3a1441c..06a9a50 100644
--- a/plugins/giggle-view-terminal.c
+++ b/plugins/giggle-view-terminal.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/plugins/giggle-view-terminal.h b/plugins/giggle-view-terminal.h
index a85510a..2257e34 100644
--- a/plugins/giggle-view-terminal.h
+++ b/plugins/giggle-view-terminal.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_TERMINAL_H__
diff --git a/src/eggfindbar.c b/src/eggfindbar.c
index c6f7746..78daa4d 100644
--- a/src/eggfindbar.c
+++ b/src/eggfindbar.c
@@ -10,10 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/eggfindbar.h b/src/eggfindbar.h
index 51298e4..9cb9b7d 100644
--- a/src/eggfindbar.h
+++ b/src/eggfindbar.h
@@ -10,11 +10,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __EGG_FIND_BAR_H__
diff --git a/src/giggle-authors-view.c b/src/giggle-authors-view.c
index a9fcbed..8215b35 100644
--- a/src/giggle-authors-view.c
+++ b/src/giggle-authors-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-authors-view.h b/src/giggle-authors-view.h
index c2b63b5..54e5f53 100644
--- a/src/giggle-authors-view.h
+++ b/src/giggle-authors-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_AUTHORS_VIEW_H__
diff --git a/src/giggle-avatar-cache.c b/src/giggle-avatar-cache.c
index f2b5b29..f7d5383 100644
--- a/src/giggle-avatar-cache.c
+++ b/src/giggle-avatar-cache.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-avatar-cache.h b/src/giggle-avatar-cache.h
index a1044bc..494bc8b 100644
--- a/src/giggle-avatar-cache.h
+++ b/src/giggle-avatar-cache.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_AVATAR_CACHE_H__
diff --git a/src/giggle-avatar-image.c b/src/giggle-avatar-image.c
index 57ff554..e4f2da3 100644
--- a/src/giggle-avatar-image.c
+++ b/src/giggle-avatar-image.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-avatar-image.h b/src/giggle-avatar-image.h
index d29a1b3..aa75584 100644
--- a/src/giggle-avatar-image.h
+++ b/src/giggle-avatar-image.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_AVATAR_IMAGE_H__
diff --git a/src/giggle-branches-view.c b/src/giggle-branches-view.c
index a368c83..4dcbbdc 100644
--- a/src/giggle-branches-view.c
+++ b/src/giggle-branches-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-branches-view.h b/src/giggle-branches-view.h
index e396cf7..ba04a0b 100644
--- a/src/giggle-branches-view.h
+++ b/src/giggle-branches-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_BRANCHES_VIEW_H__
diff --git a/src/giggle-clone-dialog.c b/src/giggle-clone-dialog.c
index 7a32f92..0eb2e7c 100644
--- a/src/giggle-clone-dialog.c
+++ b/src/giggle-clone-dialog.c
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/giggle-clone-dialog.h b/src/giggle-clone-dialog.h
index 3e2de3a..5d45731 100644
--- a/src/giggle-clone-dialog.h
+++ b/src/giggle-clone-dialog.h
@@ -11,7 +11,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the GNU General Public License License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
diff --git a/src/giggle-description-editor.c b/src/giggle-description-editor.c
index 3e832fb..c28470b 100644
--- a/src/giggle-description-editor.c
+++ b/src/giggle-description-editor.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-description-editor.h b/src/giggle-description-editor.h
index ed885f1..b7eccb2 100644
--- a/src/giggle-description-editor.h
+++ b/src/giggle-description-editor.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_DESCRIPTION_EDITOR_H__
diff --git a/src/giggle-diff-tree-view.c b/src/giggle-diff-tree-view.c
index 62905f9..708e5bd 100644
--- a/src/giggle-diff-tree-view.c
+++ b/src/giggle-diff-tree-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-diff-tree-view.h b/src/giggle-diff-tree-view.h
index 8fd62c2..7d34f20 100644
--- a/src/giggle-diff-tree-view.h
+++ b/src/giggle-diff-tree-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_DIFF_TREE_VIEW_H__
diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c
index d7105f8..3ded28d 100644
--- a/src/giggle-diff-view.c
+++ b/src/giggle-diff-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h
index de5fe02..74fb983 100644
--- a/src/giggle-diff-view.h
+++ b/src/giggle-diff-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_DIFF_VIEW_H__
diff --git a/src/giggle-diff-window.c b/src/giggle-diff-window.c
index c461df1..f047e04 100644
--- a/src/giggle-diff-window.c
+++ b/src/giggle-diff-window.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-diff-window.h b/src/giggle-diff-window.h
index fc9d5a1..97623ec 100644
--- a/src/giggle-diff-window.h
+++ b/src/giggle-diff-window.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_DIFF_WINDOW_H__
diff --git a/src/giggle-file-list.c b/src/giggle-file-list.c
index 942b805..bdd8c2f 100644
--- a/src/giggle-file-list.c
+++ b/src/giggle-file-list.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-file-list.h b/src/giggle-file-list.h
index 89c6180..7b706a2 100644
--- a/src/giggle-file-list.h
+++ b/src/giggle-file-list.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_FILE_LIST_H__
diff --git a/src/giggle-graph-renderer.c b/src/giggle-graph-renderer.c
index 62033a7..2522f02 100644
--- a/src/giggle-graph-renderer.c
+++ b/src/giggle-graph-renderer.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-graph-renderer.h b/src/giggle-graph-renderer.h
index 609b9b9..b8fa4c1 100644
--- a/src/giggle-graph-renderer.h
+++ b/src/giggle-graph-renderer.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_GRAPH_RENDERER_H__
diff --git a/src/giggle-helpers.c b/src/giggle-helpers.c
index 9975ece..8ac3438 100644
--- a/src/giggle-helpers.c
+++ b/src/giggle-helpers.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-helpers.h b/src/giggle-helpers.h
index 5d39ad9..01b9fcf 100644
--- a/src/giggle-helpers.h
+++ b/src/giggle-helpers.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_HELPERS_H__
diff --git a/src/giggle-input-dialog.c b/src/giggle-input-dialog.c
index cb76693..e018714 100644
--- a/src/giggle-input-dialog.c
+++ b/src/giggle-input-dialog.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-input-dialog.h b/src/giggle-input-dialog.h
index 169dfc8..ad0085e 100644
--- a/src/giggle-input-dialog.h
+++ b/src/giggle-input-dialog.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_INPUT_DIALOG_H__
diff --git a/src/giggle-label-action.c b/src/giggle-label-action.c
index 177fd61..3194a3b 100644
--- a/src/giggle-label-action.c
+++ b/src/giggle-label-action.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-label-action.h b/src/giggle-label-action.h
index e3a114f..ddd6298 100644
--- a/src/giggle-label-action.h
+++ b/src/giggle-label-action.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_LABEL_ACTION_H__
diff --git a/src/giggle-main.c b/src/giggle-main.c
index 2b339b0..67634c2 100644
--- a/src/giggle-main.c
+++ b/src/giggle-main.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-remote-editor.c b/src/giggle-remote-editor.c
index 4b7eed9..e208c82 100644
--- a/src/giggle-remote-editor.c
+++ b/src/giggle-remote-editor.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-remote-editor.h b/src/giggle-remote-editor.h
index 652c9d8..71d7094 100644
--- a/src/giggle-remote-editor.h
+++ b/src/giggle-remote-editor.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REMOTE_EDITOR_H__
diff --git a/src/giggle-remotes-view.c b/src/giggle-remotes-view.c
index b52ef3b..dd4726a 100644
--- a/src/giggle-remotes-view.c
+++ b/src/giggle-remotes-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-remotes-view.h b/src/giggle-remotes-view.h
index 191def3..3fc5b86 100644
--- a/src/giggle-remotes-view.h
+++ b/src/giggle-remotes-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REMOTES_VIEW_H__
diff --git a/src/giggle-rev-list-view.c b/src/giggle-rev-list-view.c
index 9a7359e..669f5dd 100644
--- a/src/giggle-rev-list-view.c
+++ b/src/giggle-rev-list-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-rev-list-view.h b/src/giggle-rev-list-view.h
index 0d92463..fbaac11 100644
--- a/src/giggle-rev-list-view.h
+++ b/src/giggle-rev-list-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REV_LIST_VIEW_H__
diff --git a/src/giggle-revision-info-action.c b/src/giggle-revision-info-action.c
index 32fea15..930b77f 100644
--- a/src/giggle-revision-info-action.c
+++ b/src/giggle-revision-info-action.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-revision-info-action.h b/src/giggle-revision-info-action.h
index c5744a3..d5ffcef 100644
--- a/src/giggle-revision-info-action.h
+++ b/src/giggle-revision-info-action.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REVISION_INFO_ACTION_H__
diff --git a/src/giggle-revision-info.c b/src/giggle-revision-info.c
index a8aa48b..92d603d 100644
--- a/src/giggle-revision-info.c
+++ b/src/giggle-revision-info.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-revision-info.h b/src/giggle-revision-info.h
index eae6272..bb04679 100644
--- a/src/giggle-revision-info.h
+++ b/src/giggle-revision-info.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REVISION_INFO_H__
diff --git a/src/giggle-revision-view.c b/src/giggle-revision-view.c
index e56d5b9..2def670 100644
--- a/src/giggle-revision-view.c
+++ b/src/giggle-revision-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-revision-view.h b/src/giggle-revision-view.h
index e98df4e..50a0e58 100644
--- a/src/giggle-revision-view.h
+++ b/src/giggle-revision-view.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_REVISION_VIEW_H__
diff --git a/src/giggle-short-list.c b/src/giggle-short-list.c
index 5d5bf73..1bb10d0 100644
--- a/src/giggle-short-list.c
+++ b/src/giggle-short-list.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-short-list.h b/src/giggle-short-list.h
index c635b7f..d11b564 100644
--- a/src/giggle-short-list.h
+++ b/src/giggle-short-list.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_SHORT_LIST_H__
diff --git a/src/giggle-spaning-renderer.c b/src/giggle-spaning-renderer.c
index 0c08723..70dfc2f 100644
--- a/src/giggle-spaning-renderer.c
+++ b/src/giggle-spaning-renderer.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-spaning-renderer.h b/src/giggle-spaning-renderer.h
index e88a325..92edc75 100644
--- a/src/giggle-spaning-renderer.h
+++ b/src/giggle-spaning-renderer.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_SPANING_RENDERER_H__
diff --git a/src/giggle-view-diff.c b/src/giggle-view-diff.c
index bd52c58..e388a11 100644
--- a/src/giggle-view-diff.c
+++ b/src/giggle-view-diff.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/giggle-view-diff.h b/src/giggle-view-diff.h
index 7c1df17..a1c2c14 100644
--- a/src/giggle-view-diff.h
+++ b/src/giggle-view-diff.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_DIFF_H__
diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
index 7746225..130af4a 100644
--- a/src/giggle-view-file.c
+++ b/src/giggle-view-file.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-view-file.h b/src/giggle-view-file.h
index a564da9..1935f66 100644
--- a/src/giggle-view-file.h
+++ b/src/giggle-view-file.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_FILE_H__
diff --git a/src/giggle-view-history.c b/src/giggle-view-history.c
index 2cc8b48..4a56a9b 100644
--- a/src/giggle-view-history.c
+++ b/src/giggle-view-history.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-view-history.h b/src/giggle-view-history.h
index 54857dd..56bc380 100644
--- a/src/giggle-view-history.h
+++ b/src/giggle-view-history.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_HISTORY_H__
diff --git a/src/giggle-view-summary.c b/src/giggle-view-summary.c
index 2936660..8e4a0f1 100644
--- a/src/giggle-view-summary.c
+++ b/src/giggle-view-summary.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-view-summary.h b/src/giggle-view-summary.h
index cf314ca..bdc86d2 100644
--- a/src/giggle-view-summary.h
+++ b/src/giggle-view-summary.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_VIEW_SUMMARY_H__
diff --git a/src/giggle-window.c b/src/giggle-window.c
index ced4ead..2efc31f 100644
--- a/src/giggle-window.c
+++ b/src/giggle-window.c
@@ -14,10 +14,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "config.h"
diff --git a/src/giggle-window.h b/src/giggle-window.h
index 2be3677..202831f 100644
--- a/src/giggle-window.h
+++ b/src/giggle-window.h
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef __GIGGLE_WINDOW_H__
diff --git a/src/test-patch-view.c b/src/test-patch-view.c
index 2f86f19..03a3f4d 100644
--- a/src/test-patch-view.c
+++ b/src/test-patch-view.c
@@ -12,10 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>