Updated FSF's address

108 files changed, 108 insertions, 324 deletions

diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index ef9f8023..7c09a01a 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_COMPOSITOR_PRIVATE_H
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c
index b79394ae..2253755c 100644
--- a/src/compositor/compositor-xrender.c
+++ b/src/compositor/compositor-xrender.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/compositor/compositor-xrender.h b/src/compositor/compositor-xrender.h
index 5c8a36c0..afb37074 100644
--- a/src/compositor/compositor-xrender.h
+++ b/src/compositor/compositor-xrender.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_COMPOSITOR_XRENDER_H_
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index 975bf341..70e00d12 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/above-tab-keycode.c b/src/core/above-tab-keycode.c
index 856afe5d..e980f522 100644
--- a/src/core/above-tab-keycode.c
+++ b/src/core/above-tab-keycode.c
@@ -15,9 +15,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* The standard cycle-windows keybinding should be the key above the
diff --git a/src/core/atomnames.h b/src/core/atomnames.h
index 14dbd8f3..7048d638 100644
--- a/src/core/atomnames.h
+++ b/src/core/atomnames.h
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/core/bell.c b/src/core/bell.c
index 4de91f9c..c1f3b778 100644
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/core/bell.h b/src/core/bell.h
index 462d1ed7..c9b8d71e 100644
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -26,9 +26,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <X11/Xlib.h>
diff --git a/src/core/boxes.c b/src/core/boxes.c
index e57663e0..579c80d6 100644
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -21,9 +21,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "boxes.h"
diff --git a/src/core/constraints.c b/src/core/constraints.c
index 82661cdb..f3a1613a 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/constraints.h b/src/core/constraints.h
index 6ccad00e..3090831a 100644
--- a/src/core/constraints.h
+++ b/src/core/constraints.h
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_CONSTRAINTS_H
diff --git a/src/core/core.c b/src/core/core.c
index a2fd1e86..b7806d4e 100644
--- a/src/core/core.c
+++ b/src/core/core.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/delete.c b/src/core/delete.c
index 27f3fefd..f3ed106b 100644
--- a/src/core/delete.c
+++ b/src/core/delete.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/core/display-private.h b/src/core/display-private.h
index feee8515..6bf2c4db 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -19,9 +19,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_DISPLAY_PRIVATE_H
diff --git a/src/core/display.c b/src/core/display.c
index 440f2fb8..d1036b83 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -19,9 +19,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/core/edge-resistance.c b/src/core/edge-resistance.c
index fd3f2d44..bd2d551d 100644
--- a/src/core/edge-resistance.c
+++ b/src/core/edge-resistance.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/edge-resistance.h b/src/core/edge-resistance.h
index 14ba17a0..c8584902 100644
--- a/src/core/edge-resistance.h
+++ b/src/core/edge-resistance.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_EDGE_RESISTANCE_H
diff --git a/src/core/effects.c b/src/core/effects.c
index be369799..532cdda0 100644
--- a/src/core/effects.c
+++ b/src/core/effects.c
@@ -50,9 +50,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/effects.h b/src/core/effects.h
index 91d09e15..9d0052e1 100644
--- a/src/core/effects.h
+++ b/src/core/effects.h
@@ -37,9 +37,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_EFFECTS_H
diff --git a/src/core/errors.c b/src/core/errors.c
index 8de46080..137fd6e4 100644
--- a/src/core/errors.c
+++ b/src/core/errors.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/eventqueue.c b/src/core/eventqueue.c
index 4ce3e46a..fc943e10 100644
--- a/src/core/eventqueue.c
+++ b/src/core/eventqueue.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  */
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "eventqueue.h"
 #include <X11/Xlib.h>
diff --git a/src/core/eventqueue.h b/src/core/eventqueue.h
index cd115bdb..ebe4cb0d 100644
--- a/src/core/eventqueue.h
+++ b/src/core/eventqueue.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_EVENT_QUEUE_H
diff --git a/src/core/frame-private.h b/src/core/frame-private.h
index cba9b52a..6ed163ff 100644
--- a/src/core/frame-private.h
+++ b/src/core/frame-private.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_FRAME_PRIVATE_H
diff --git a/src/core/frame.c b/src/core/frame.c
index 19955cdc..0459bb6a 100644
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/group-private.h b/src/core/group-private.h
index 25b05c77..ab6cf2ec 100644
--- a/src/core/group-private.h
+++ b/src/core/group-private.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_GROUP_PRIVATE_H
diff --git a/src/core/group-props.c b/src/core/group-props.c
index 05e82900..521ffbd6 100644
--- a/src/core/group-props.c
+++ b/src/core/group-props.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/group-props.h b/src/core/group-props.h
index ffde0901..6c264e2e 100644
--- a/src/core/group-props.h
+++ b/src/core/group-props.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_GROUP_PROPS_H
diff --git a/src/core/group.c b/src/core/group.c
index 69c879ee..aed11b5b 100644
--- a/src/core/group.c
+++ b/src/core/group.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/group.h b/src/core/group.h
index 562ac59b..253d2eff 100644
--- a/src/core/group.h
+++ b/src/core/group.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_GROUP_H
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index 7fa21840..055164e2 100644
--- a/src/core/iconcache.c
+++ b/src/core/iconcache.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/iconcache.h b/src/core/iconcache.h
index ac3e40ca..a8630b6a 100644
--- a/src/core/iconcache.h
+++ b/src/core/iconcache.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_ICON_CACHE_H
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index cc093b01..a3f9fedc 100644
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/core/keybindings.h b/src/core/keybindings.h
index f845b48a..d0c70cd4 100644
--- a/src/core/keybindings.h
+++ b/src/core/keybindings.h
@@ -21,9 +21,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_KEYBINDINGS_H
diff --git a/src/core/main.c b/src/core/main.c
index ea0ff896..4f9a37c0 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/core/place.c b/src/core/place.c
index 901335c9..4c20a3ff 100644
--- a/src/core/place.c
+++ b/src/core/place.c
@@ -19,9 +19,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/place.h b/src/core/place.h
index 10bf4a1c..4d7a9b26 100644
--- a/src/core/place.h
+++ b/src/core/place.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_PLACE_H
diff --git a/src/core/prefs.c b/src/core/prefs.c
index 58f11e9b..7d2ce93a 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -19,9 +19,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/screen-private.h b/src/core/screen-private.h
index 8430f198..326cf61b 100644
--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@@ -25,9 +25,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_SCREEN_PRIVATE_H
diff --git a/src/core/screen.c b/src/core/screen.c
index 85d2165c..a471e1a7 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -21,9 +21,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/session.c b/src/core/session.c
index 024d88fe..f60afc38 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/session.h b/src/core/session.h
index 62a9370d..c032ff10 100644
--- a/src/core/session.h
+++ b/src/core/session.h
@@ -23,9 +23,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_SESSION_H
diff --git a/src/core/stack.c b/src/core/stack.c
index cf770bca..a619f960 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -21,9 +21,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/stack.h b/src/core/stack.h
index f9693897..f6d22f44 100644
--- a/src/core/stack.h
+++ b/src/core/stack.h
@@ -33,9 +33,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_STACK_H
diff --git a/src/core/testboxes.c b/src/core/testboxes.c
index 91ac2f87..953a66a7 100644
--- a/src/core/testboxes.c
+++ b/src/core/testboxes.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "boxes.h"
diff --git a/src/core/util.c b/src/core/util.c
index 2b6397c2..e7d607f6 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/core/window-private.h b/src/core/window-private.h
index 7cf5b04a..85e3c5bc 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -26,9 +26,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_WINDOW_PRIVATE_H
diff --git a/src/core/window-props.c b/src/core/window-props.c
index b7b3e12d..3fb7d6df 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -30,9 +30,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/core/window-props.h b/src/core/window-props.h
index 1e60eff0..50b615c4 100644
--- a/src/core/window-props.h
+++ b/src/core/window-props.h
@@ -24,9 +24,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_WINDOW_PROPS_H
diff --git a/src/core/window.c b/src/core/window.c
index 2f2f8000..ac7f82a7 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -19,9 +19,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/workspace.c b/src/core/workspace.c
index e877b195..8ba66739 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/core/workspace.h b/src/core/workspace.h
index f4079ebb..d84ef94b 100644
--- a/src/core/workspace.h
+++ b/src/core/workspace.h
@@ -25,9 +25,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_WORKSPACE_H
diff --git a/src/core/xprops.c b/src/core/xprops.c
index a39c7b4f..f8bcd8e1 100644
--- a/src/core/xprops.c
+++ b/src/core/xprops.c
@@ -22,9 +22,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /***********************************************************
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index a9307268..c94ea221 100644
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/include/boxes.h b/src/include/boxes.h
index 5c76ed6b..9ae87dc4 100644
--- a/src/include/boxes.h
+++ b/src/include/boxes.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_BOXES_H
diff --git a/src/include/common.h b/src/include/common.h
index 651fa078..d408748d 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -20,9 +20,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_COMMON_H
diff --git a/src/include/compositor.h b/src/include/compositor.h
index a7f9bf1f..c28eba1e 100644
--- a/src/include/compositor.h
+++ b/src/include/compositor.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_COMPOSITOR_H
diff --git a/src/include/core.h b/src/include/core.h
index 0c518e74..94302f05 100644
--- a/src/include/core.h
+++ b/src/include/core.h
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_CORE_H
diff --git a/src/include/display.h b/src/include/display.h
index 53dd9d75..4b1270bb 100644
--- a/src/include/display.h
+++ b/src/include/display.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_DISPLAY_H
diff --git a/src/include/errors.h b/src/include/errors.h
index 8278948a..de1d5700 100644
--- a/src/include/errors.h
+++ b/src/include/errors.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_ERRORS_H
diff --git a/src/include/frame.h b/src/include/frame.h
index eeb57263..09b74577 100644
--- a/src/include/frame.h
+++ b/src/include/frame.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_FRAME_H
diff --git a/src/include/main.h b/src/include/main.h
index 62106e16..8b1a3308 100644
--- a/src/include/main.h
+++ b/src/include/main.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_MAIN_H
diff --git a/src/include/prefs.h b/src/include/prefs.h
index 9efe5914..16fdc8d1 100644
--- a/src/include/prefs.h
+++ b/src/include/prefs.h
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_PREFS_H
diff --git a/src/include/resizepopup.h b/src/include/resizepopup.h
index a861ff38..df9154d8 100644
--- a/src/include/resizepopup.h
+++ b/src/include/resizepopup.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_RESIZEPOPUP_H
diff --git a/src/include/screen.h b/src/include/screen.h
index 9f842317..4f55dc0b 100644
--- a/src/include/screen.h
+++ b/src/include/screen.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_SCREEN_H
diff --git a/src/include/tabpopup.h b/src/include/tabpopup.h
index c210a191..b226fdf5 100644
--- a/src/include/tabpopup.h
+++ b/src/include/tabpopup.h
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_TABPOPUP_H
diff --git a/src/include/types.h b/src/include/types.h
index 045b102f..738521a3 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_TYPES_H
diff --git a/src/include/ui.h b/src/include/ui.h
index 386581e7..e15ade57 100644
--- a/src/include/ui.h
+++ b/src/include/ui.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_UI_H
diff --git a/src/include/util.h b/src/include/util.h
index ee8c72a7..54b11933 100644
--- a/src/include/util.h
+++ b/src/include/util.h
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_UTIL_H
diff --git a/src/include/window.h b/src/include/window.h
index 8a338660..87330de7 100644
--- a/src/include/window.h
+++ b/src/include/window.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_WINDOW_H
diff --git a/src/include/xprops.h b/src/include/xprops.h
index f5ecb6ac..f8421bb0 100644
--- a/src/include/xprops.h
+++ b/src/include/xprops.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_XPROPS_H
diff --git a/src/tools/metacity-grayscale.c b/src/tools/metacity-grayscale.c
index 8d0cd68c..9d6bf650 100644
--- a/src/tools/metacity-grayscale.c
+++ b/src/tools/metacity-grayscale.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/tools/metacity-mag.c b/src/tools/metacity-mag.c
index 22c7cc3d..654e6a21 100644
--- a/src/tools/metacity-mag.c
+++ b/src/tools/metacity-mag.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/tools/metacity-message.c b/src/tools/metacity-message.c
index 9aae7331..7d110a68 100644
--- a/src/tools/metacity-message.c
+++ b/src/tools/metacity-message.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/tools/metacity-window-demo.c b/src/tools/metacity-window-demo.c
index dce370f0..522b05d8 100644
--- a/src/tools/metacity-window-demo.c
+++ b/src/tools/metacity-window-demo.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtk.h>
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index 9dc491f5..d36694b0 100644
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -20,9 +20,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "draw-workspace.h"
diff --git a/src/ui/draw-workspace.h b/src/ui/draw-workspace.h
index 10018aa8..efccde4c 100644
--- a/src/ui/draw-workspace.h
+++ b/src/ui/draw-workspace.h
@@ -20,9 +20,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef WNCK_DRAW_WORKSPACE_H
diff --git a/src/ui/fixedtip.c b/src/ui/fixedtip.c
index 2776f2cf..91c2b09e 100644
--- a/src/ui/fixedtip.c
+++ b/src/ui/fixedtip.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/fixedtip.h b/src/ui/fixedtip.h
index c196389d..66d26839 100644
--- a/src/ui/fixedtip.h
+++ b/src/ui/fixedtip.h
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/ui/frames.c b/src/ui/frames.c
index be4e7816..eaa76529 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/frames.h b/src/ui/frames.h
index ad8d3615..6d03c198 100644
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_FRAMES_H
diff --git a/src/ui/gradient.c b/src/ui/gradient.c
index 67906231..5fc5e646 100644
--- a/src/ui/gradient.c
+++ b/src/ui/gradient.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  */
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "gradient.h"
 #include "util.h"
diff --git a/src/ui/gradient.h b/src/ui/gradient.h
index 16b3985d..addd8f01 100644
--- a/src/ui/gradient.h
+++ b/src/ui/gradient.h
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  */
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef META_GRADIENT_H
 #define META_GRADIENT_H
diff --git a/src/ui/menu.c b/src/ui/menu.c
index 9e23feb9..1906b818 100644
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/menu.h b/src/ui/menu.h
index 39bb7fa3..c741afb8 100644
--- a/src/ui/menu.h
+++ b/src/ui/menu.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_MENU_H
diff --git a/src/ui/metaaccellabel.c b/src/ui/metaaccellabel.c
index 1018f202..0c7b8529 100644
--- a/src/ui/metaaccellabel.c
+++ b/src/ui/metaaccellabel.c
@@ -19,9 +19,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/ui/metaaccellabel.h b/src/ui/metaaccellabel.h
index 0a3b5633..0e1eac9a 100644
--- a/src/ui/metaaccellabel.h
+++ b/src/ui/metaaccellabel.h
@@ -19,9 +19,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
diff --git a/src/ui/preview-widget.c b/src/ui/preview-widget.c
index 7a7b19f4..34436cd8 100644
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #define _GNU_SOURCE
diff --git a/src/ui/preview-widget.h b/src/ui/preview-widget.h
index 924b0110..ec220abe 100644
--- a/src/ui/preview-widget.h
+++ b/src/ui/preview-widget.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "theme.h"
diff --git a/src/ui/resizepopup.c b/src/ui/resizepopup.c
index c9e69fcb..e28868bc 100644
--- a/src/ui/resizepopup.c
+++ b/src/ui/resizepopup.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/tabpopup.c b/src/ui/tabpopup.c
index 2f1776ad..71acf2fa 100644
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -18,9 +18,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/testgradient.c b/src/ui/testgradient.c
index 89d0d228..33087c32 100644
--- a/src/ui/testgradient.c
+++ b/src/ui/testgradient.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  */
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
 #include "gradient.h"
 #include <gtk/gtk.h>
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 08f9de67..7e247649 100644
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/theme-parser.h b/src/ui/theme-parser.h
index 035d7005..dc36dd4a 100644
--- a/src/ui/theme-parser.h
+++ b/src/ui/theme-parser.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "theme.h"
diff --git a/src/ui/theme-viewer.c b/src/ui/theme-viewer.c
index ab4a6b59..0a9acbec 100644
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 84b57a07..e92945a8 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /**
diff --git a/src/ui/theme.h b/src/ui/theme.h
index 44ef352e..394b2b4d 100644
--- a/src/ui/theme.h
+++ b/src/ui/theme.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_THEME_H
diff --git a/src/ui/themewidget.c b/src/ui/themewidget.c
index 21227d77..01326e63 100644
--- a/src/ui/themewidget.c
+++ b/src/ui/themewidget.c
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "themewidget.h"
diff --git a/src/ui/themewidget.h b/src/ui/themewidget.h
index a94584ab..3942b778 100644
--- a/src/ui/themewidget.h
+++ b/src/ui/themewidget.h
@@ -16,9 +16,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "theme.h"
diff --git a/src/ui/ui.c b/src/ui/ui.c
index 78aa353a..d2b2f90d 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -17,9 +17,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "prefs.h"
diff --git a/src/wm-tester/main.c b/src/wm-tester/main.c
index d9b27b4d..db0814b6 100644
--- a/src/wm-tester/main.c
+++ b/src/wm-tester/main.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <gtk/gtk.h>
diff --git a/test/metacity-test b/test/metacity-test
index 99a2356b..fe1c1dfe 100644
--- a/test/metacity-test
+++ b/test/metacity-test
@@ -15,9 +15,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # ---------------------
 #
diff --git a/test/tokentest/get-tokens.py b/test/tokentest/get-tokens.py
index 728fa7c3..42a8844e 100644
--- a/test/tokentest/get-tokens.py
+++ b/test/tokentest/get-tokens.py
@@ -12,9 +12,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import os
diff --git a/test/tokentest/tokentest.c b/test/tokentest/tokentest.c
index fbfbdefd..107d9ee4 100644
--- a/test/tokentest/tokentest.c
+++ b/test/tokentest/tokentest.c
@@ -14,9 +14,7 @@
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 /* Still under heavy development. */
diff --git a/test/tokentest/tokentest.ini b/test/tokentest/tokentest.ini
index a5187873..edfc5876 100644
--- a/test/tokentest/tokentest.ini
+++ b/test/tokentest/tokentest.ini
@@ -14,9 +14,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ###########################
 
diff --git a/tools/commit-wrangler.py b/tools/commit-wrangler.py
index f3e15ea1..0ec68b71 100644
--- a/tools/commit-wrangler.py
+++ b/tools/commit-wrangler.py
@@ -17,9 +17,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import time
 import commands
diff --git a/tools/patch-wrangler.py b/tools/patch-wrangler.py
index f1bb65b0..c5e80c62 100644
--- a/tools/patch-wrangler.py
+++ b/tools/patch-wrangler.py
@@ -15,9 +15,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 import os
diff --git a/tools/ppa-magic.py b/tools/ppa-magic.py
index 5a7e3266..e3ec8399 100644
--- a/tools/ppa-magic.py
+++ b/tools/ppa-magic.py
@@ -16,9 +16,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import time
 import os
diff --git a/tools/release-wrangler.py b/tools/release-wrangler.py
index 548af7fe..1dcd5fe3 100644
--- a/tools/release-wrangler.py
+++ b/tools/release-wrangler.py
@@ -17,9 +17,7 @@
 # General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import os
 import posixpath