diff --git a/src/compositor/clutter-utils.c b/src/compositor/clutter-utils.c
index 7bca7c54e..6b2fb7328 100644
--- a/src/compositor/clutter-utils.c
+++ b/src/compositor/clutter-utils.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 "clutter-utils.h"
diff --git a/src/compositor/clutter-utils.h b/src/compositor/clutter-utils.h
index 862b6efe6..a6d76ce21 100644
--- a/src/compositor/clutter-utils.h
+++ b/src/compositor/clutter-utils.h
@@ -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/>.
  */
 
 #ifndef __META_CLUTTER_UTILS_H__
diff --git a/src/compositor/cogl-utils.c b/src/compositor/cogl-utils.c
index f158fdea4..fe4893cd3 100644
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.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 <clutter/clutter.h>
diff --git a/src/compositor/cogl-utils.h b/src/compositor/cogl-utils.h
index fb9b4c2d8..8184818c7 100644
--- a/src/compositor/cogl-utils.h
+++ b/src/compositor/cogl-utils.h
@@ -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/>.
  */
 
 #ifndef __META_COGL_UTILS_H__
diff --git a/src/compositor/meta-background-actor.c b/src/compositor/meta-background-actor.c
index b5270c5eb..ff0dc2117 100644
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.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/>.
  *
  * Portions adapted from gnome-shell/src/shell-global.c
  */
diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c
index 244602c5e..4337f7053 100644
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.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/>.
  */
 
 /**
diff --git a/src/compositor/meta-cullable.c b/src/compositor/meta-cullable.c
index 691014052..5eb19026a 100644
--- a/src/compositor/meta-cullable.c
+++ b/src/compositor/meta-cullable.c
@@ -13,9 +13,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/>.
  *
  * Written by:
  *     Owen Taylor <otaylor@redhat.com>
diff --git a/src/compositor/meta-cullable.h b/src/compositor/meta-cullable.h
index 5a8c215f1..c1b886d2c 100644
--- a/src/compositor/meta-cullable.h
+++ b/src/compositor/meta-cullable.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/>.
  *
  * Written by:
  *     Owen Taylor <otaylor@redhat.com>
diff --git a/src/compositor/meta-module.c b/src/compositor/meta-module.c
index 7badc8cd9..1369b8086 100644
--- a/src/compositor/meta-module.c
+++ b/src/compositor/meta-module.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 <meta/meta-plugin.h>
diff --git a/src/compositor/meta-module.h b/src/compositor/meta-module.h
index 7e94ae680..dd6d5a685 100644
--- a/src/compositor/meta-module.h
+++ b/src/compositor/meta-module.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_MODULE_H_
diff --git a/src/compositor/meta-plugin-manager.c b/src/compositor/meta-plugin-manager.c
index dee1b0801..1d6d373ce 100644
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.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/compositor/meta-plugin-manager.h b/src/compositor/meta-plugin-manager.h
index f39f5cada..b24059ffc 100644
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.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_PLUGIN_MANAGER_H_
diff --git a/src/compositor/meta-plugin.c b/src/compositor/meta-plugin.c
index 95aec5c58..8cdc0ed63 100644
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.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/compositor/meta-shadow-factory-private.h b/src/compositor/meta-shadow-factory-private.h
index c4a1bbd96..8a24b5fd1 100644
--- a/src/compositor/meta-shadow-factory-private.h
+++ b/src/compositor/meta-shadow-factory-private.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_SHADOW_FACTORY_PRIVATE_H__
diff --git a/src/compositor/meta-shadow-factory.c b/src/compositor/meta-shadow-factory.c
index 3af62fc96..c9f8786c3 100644
--- a/src/compositor/meta-shadow-factory.c
+++ b/src/compositor/meta-shadow-factory.c
@@ -13,9 +13,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/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
index 8d45d9bf0..b37770e4e 100644
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.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/compositor/meta-texture-rectangle.c b/src/compositor/meta-texture-rectangle.c
index 168e09b4c..3fc9430b5 100644
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.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/compositor/meta-texture-rectangle.h b/src/compositor/meta-texture-rectangle.h
index 7372b29e3..30f60d3df 100644
--- a/src/compositor/meta-texture-rectangle.h
+++ b/src/compositor/meta-texture-rectangle.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/>.
  */
 
 #ifndef __META_TEXTURE_RECTANGLE_H__
diff --git a/src/compositor/meta-texture-tower.c b/src/compositor/meta-texture-tower.c
index 9afed601d..207abb279 100644
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.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 <math.h>
diff --git a/src/compositor/meta-texture-tower.h b/src/compositor/meta-texture-tower.h
index e135d8056..b1228c604 100644
--- a/src/compositor/meta-texture-tower.h
+++ b/src/compositor/meta-texture-tower.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_TEXTURE_TOWER_H__
diff --git a/src/compositor/meta-window-shape.c b/src/compositor/meta-window-shape.c
index 258079339..a41ed6ad1 100644
--- a/src/compositor/meta-window-shape.c
+++ b/src/compositor/meta-window-shape.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 <string.h>
 
diff --git a/src/compositor/meta-window-shape.h b/src/compositor/meta-window-shape.h
index 1dd6c70fe..da23e5e9d 100644
--- a/src/compositor/meta-window-shape.h
+++ b/src/compositor/meta-window-shape.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_WINDOW_SHAPE_H__
diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c
index b6cccf1ae..91b30c039 100644
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.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/compositor/region-utils.c b/src/compositor/region-utils.c
index 34e1d4d58..486245532 100644
--- a/src/compositor/region-utils.c
+++ b/src/compositor/region-utils.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/>.
  */
 
 #include "region-utils.h"
diff --git a/src/compositor/region-utils.h b/src/compositor/region-utils.h
index c494e97c5..16304dc70 100644
--- a/src/compositor/region-utils.h
+++ b/src/compositor/region-utils.h
@@ -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/>.
  */
 
 #ifndef __META_REGION_UTILS_H__
diff --git a/src/core/above-tab-keycode.c b/src/core/above-tab-keycode.c
index 856afe5d9..e980f5228 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/bell.c b/src/core/bell.c
index 5b40c2ed9..cc25a27ec 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 0065be9d4..ef2328f85 100644
--- a/src/core/bell.h
+++ b/src/core/bell.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/>.
  */
 
 #include <X11/Xlib.h>
diff --git a/src/core/boxes-private.h b/src/core/boxes-private.h
index 8e402b0dd..6b2abde6d 100644
--- a/src/core/boxes-private.h
+++ b/src/core/boxes-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_BOXES_PRIVATE_H
diff --git a/src/core/boxes.c b/src/core/boxes.c
index 3c4f4446d..7f916cb5a 100644
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -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/>.
  */
 
 #include "boxes-private.h"
diff --git a/src/core/constraints.c b/src/core/constraints.c
index 302267fac..3634bffa9 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 07c65290c..52a6f209f 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 6840ece87..cb2a747e5 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/core.h b/src/core/core.h
index 7b861da7e..a3321531b 100644
--- a/src/core/core.h
+++ b/src/core/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/core/delete.c b/src/core/delete.c
index 90a35f33b..437becf1e 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 _XOPEN_SOURCE /* for kill() */
diff --git a/src/core/display-private.h b/src/core/display-private.h
index a8fa75363..4d86eae65 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 2313c8823..8a98cf5ab 100644
--- a/src/core/display.c
+++ b/src/core/display.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/edge-resistance.c b/src/core/edge-resistance.c
index 17cde421f..6a2648a0a 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 14ba17a09..c85849020 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/errors.c b/src/core/errors.c
index 4028133c1..56a7bd423 100644
--- a/src/core/errors.c
+++ b/src/core/errors.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/>.
  */
 
 /**
diff --git a/src/core/frame.c b/src/core/frame.c
index fa4359697..5fa7bee17 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/frame.h b/src/core/frame.h
index d633adc25..0f1ebea4f 100644
--- a/src/core/frame.h
+++ b/src/core/frame.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/group-private.h b/src/core/group-private.h
index 6f56b1b16..72e6cd275 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 05e829003..521ffbd60 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 a0fb70f6b..1fb49ea1a 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 8655d48a1..8965735c2 100644
--- a/src/core/group.c
+++ b/src/core/group.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/>.
  */
 
 /**
diff --git a/src/core/iconcache.c b/src/core/iconcache.c
index cb3924b16..30018d22e 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 22a241bef..84143a61c 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-private.h b/src/core/keybindings-private.h
index da36666fc..07889220e 100644
--- a/src/core/keybindings-private.h
+++ b/src/core/keybindings-private.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_PRIVATE_H
diff --git a/src/core/keybindings.c b/src/core/keybindings.c
index 515e591d1..727a63a8f 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/>.
  */
 
 /**
diff --git a/src/core/main.c b/src/core/main.c
index 2cba35ce2..89a9d06fd 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/meta-cursor-tracker-private.h b/src/core/meta-cursor-tracker-private.h
index b0ad11e6a..b089f0f80 100644
--- a/src/core/meta-cursor-tracker-private.h
+++ b/src/core/meta-cursor-tracker-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/>.
  *
  * Author: Giovanni Campagna <gcampagn@redhat.com>
  */
diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
index 550abff83..a603d95a5 100644
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.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/>.
  *
  * Author: Giovanni Campagna <gcampagn@redhat.com>
  */
diff --git a/src/core/meta-idle-monitor-private.h b/src/core/meta-idle-monitor-private.h
index 40608ffd9..05289782f 100644
--- a/src/core/meta-idle-monitor-private.h
+++ b/src/core/meta-idle-monitor-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/>.
  *
  * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
  *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
diff --git a/src/core/meta-idle-monitor.c b/src/core/meta-idle-monitor.c
index ac38b04c0..7712cc78d 100644
--- a/src/core/meta-idle-monitor.c
+++ b/src/core/meta-idle-monitor.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/>.
  *
  * Adapted from gnome-session/gnome-session/gs-idle-monitor.c and
  *         from gnome-desktop/libgnome-desktop/gnome-idle-monitor.c
diff --git a/src/core/meta-xrandr-shared.h b/src/core/meta-xrandr-shared.h
index 827876a66..99e3d9825 100644
--- a/src/core/meta-xrandr-shared.h
+++ b/src/core/meta-xrandr-shared.h
@@ -13,9 +13,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/>.
  */
 
 /* This file is shared between mutter (src/core/meta-xrandr-shared.h)
diff --git a/src/core/monitor-config.c b/src/core/monitor-config.c
index e5aee4d00..5d69a5d52 100644
--- a/src/core/monitor-config.c
+++ b/src/core/monitor-config.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/>.
  */
 
 /*
diff --git a/src/core/monitor-private.h b/src/core/monitor-private.h
index fdb11a7ec..2b0ef422c 100644
--- a/src/core/monitor-private.h
+++ b/src/core/monitor-private.h
@@ -29,9 +29,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_MONITOR_PRIVATE_H
diff --git a/src/core/monitor-xrandr.c b/src/core/monitor-xrandr.c
index 167b94c54..66d89539d 100644
--- a/src/core/monitor-xrandr.c
+++ b/src/core/monitor-xrandr.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 "config.h"
diff --git a/src/core/monitor.c b/src/core/monitor.c
index db47899c9..daca82a70 100644
--- a/src/core/monitor.c
+++ b/src/core/monitor.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 "config.h"
diff --git a/src/core/mutter.c b/src/core/mutter.c
index 08f833b65..00164c15c 100644
--- a/src/core/mutter.c
+++ b/src/core/mutter.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/place.c b/src/core/place.c
index 821fca039..8894114d6 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 d9647e25b..250f2045d 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 3a4909fea..7534210b8 100644
--- a/src/core/prefs.c
+++ b/src/core/prefs.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/screen-private.h b/src/core/screen-private.h
index 36c7a38ef..3d02e1827 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 939412544..cc3c13419 100644
--- a/src/core/screen.c
+++ b/src/core/screen.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/session.c b/src/core/session.c
index 6d435fd5c..269d4d0c3 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 62a9370d1..c032ff10c 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-tracker.c b/src/core/stack-tracker.c
index 63044a2d8..5d88a46da 100644
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -29,9 +29,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-tracker.h b/src/core/stack-tracker.h
index 4b7b1bfd7..f74400efa 100644
--- a/src/core/stack-tracker.h
+++ b/src/core/stack-tracker.h
@@ -28,9 +28,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_TRACKER_H
diff --git a/src/core/stack.c b/src/core/stack.c
index ed1d6d8d4..6cf078c52 100644
--- a/src/core/stack.c
+++ b/src/core/stack.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/>.
  */
 
 #include <config.h>
diff --git a/src/core/stack.h b/src/core/stack.h
index 423672b32..f9555a981 100644
--- a/src/core/stack.h
+++ b/src/core/stack.h
@@ -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/>.
  */
 
 #ifndef META_STACK_H
diff --git a/src/core/testboxes.c b/src/core/testboxes.c
index 128efac77..19def8cf5 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-private.h"
diff --git a/src/core/util.c b/src/core/util.c
index 48d6e56a0..3ac907fd4 100644
--- a/src/core/util.c
+++ b/src/core/util.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/>.
  */
 
 /**
diff --git a/src/core/window-private.h b/src/core/window-private.h
index ef4c83df8..7c09e6835 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 447ac3e92..a9145eefa 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -31,9 +31,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 16db50b9e..4ea42719f 100644
--- a/src/core/window-props.h
+++ b/src/core/window-props.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_WINDOW_PROPS_H
diff --git a/src/core/window.c b/src/core/window.c
index 4b05d4e3f..b4a845d6a 100644
--- a/src/core/window.c
+++ b/src/core/window.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/workspace-private.h b/src/core/workspace-private.h
index 4e94fa052..4228a9b6e 100644
--- a/src/core/workspace-private.h
+++ b/src/core/workspace-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_WORKSPACE_PRIVATE_H
diff --git a/src/core/workspace.c b/src/core/workspace.c
index e5da6d226..f1e2527a1 100644
--- a/src/core/workspace.c
+++ b/src/core/workspace.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/core/xprops.c b/src/core/xprops.c
index 040581c53..33278ab07 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/core/xprops.h b/src/core/xprops.h
index a5c4fb9a3..241557ff7 100644
--- a/src/core/xprops.h
+++ b/src/core/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/meta/atomnames.h b/src/meta/atomnames.h
index f83ff8cbe..d5e8a47ff 100644
--- a/src/meta/atomnames.h
+++ b/src/meta/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/meta/boxes.h b/src/meta/boxes.h
index 0adcfcb37..489ce04b3 100644
--- a/src/meta/boxes.h
+++ b/src/meta/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/meta/common.h b/src/meta/common.h
index e9fe62990..ffccb2d92 100644
--- a/src/meta/common.h
+++ b/src/meta/common.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_COMMON_H
diff --git a/src/meta/compositor-mutter.h b/src/meta/compositor-mutter.h
index a0f5140fd..ee120edd1 100644
--- a/src/meta/compositor-mutter.h
+++ b/src/meta/compositor-mutter.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 MUTTER_H_
diff --git a/src/meta/compositor.h b/src/meta/compositor.h
index b0e54550d..42ff0dd8e 100644
--- a/src/meta/compositor.h
+++ b/src/meta/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/meta/display.h b/src/meta/display.h
index 09f95e9cc..60e9ab14d 100644
--- a/src/meta/display.h
+++ b/src/meta/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/meta/errors.h b/src/meta/errors.h
index 6ac141722..d2aa27b6b 100644
--- a/src/meta/errors.h
+++ b/src/meta/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/meta/gradient.h b/src/meta/gradient.h
index bcf5521b2..1c9ac242f 100644
--- a/src/meta/gradient.h
+++ b/src/meta/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/meta/group.h b/src/meta/group.h
index 3f16edd6c..2ec647806 100644
--- a/src/meta/group.h
+++ b/src/meta/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/meta/keybindings.h b/src/meta/keybindings.h
index b89619512..55216c243 100644
--- a/src/meta/keybindings.h
+++ b/src/meta/keybindings.h
@@ -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/>.
  */
 
 #ifndef META_KEYBINDINGS_H
diff --git a/src/meta/main.h b/src/meta/main.h
index dd4e7f1d9..35eb73da7 100644
--- a/src/meta/main.h
+++ b/src/meta/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/meta/meta-background-actor.h b/src/meta/meta-background-actor.h
index 96fe1c636..56e97688f 100644
--- a/src/meta/meta-background-actor.h
+++ b/src/meta/meta-background-actor.h
@@ -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/>.
  */
 
 #ifndef META_BACKGROUND_ACTOR_H
diff --git a/src/meta/meta-background.h b/src/meta/meta-background.h
index 0295d4e94..c171df326 100644
--- a/src/meta/meta-background.h
+++ b/src/meta/meta-background.h
@@ -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/>.
  */
 
 #ifndef META_BACKGROUND_H
diff --git a/src/meta/meta-cursor-tracker.h b/src/meta/meta-cursor-tracker.h
index 39202951a..e045fa51f 100644
--- a/src/meta/meta-cursor-tracker.h
+++ b/src/meta/meta-cursor-tracker.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/>.
  *
  * Author: Giovanni Campagna <gcampagn@redhat.com>
  */
diff --git a/src/meta/meta-idle-monitor.h b/src/meta/meta-idle-monitor.h
index 883827373..b77d8e250 100644
--- a/src/meta/meta-idle-monitor.h
+++ b/src/meta/meta-idle-monitor.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_IDLE_MONITOR_H
diff --git a/src/meta/meta-plugin.h b/src/meta/meta-plugin.h
index 0587551c8..00fe77989 100644
--- a/src/meta/meta-plugin.h
+++ b/src/meta/meta-plugin.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_PLUGIN_H_
diff --git a/src/meta/meta-shadow-factory.h b/src/meta/meta-shadow-factory.h
index b95ec49f8..466264e93 100644
--- a/src/meta/meta-shadow-factory.h
+++ b/src/meta/meta-shadow-factory.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_SHADOW_FACTORY_H__
diff --git a/src/meta/meta-shaped-texture.h b/src/meta/meta-shaped-texture.h
index dac4ccc25..9eea4b8d9 100644
--- a/src/meta/meta-shaped-texture.h
+++ b/src/meta/meta-shaped-texture.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/>.
  */
 
 #ifndef __META_SHAPED_TEXTURE_H__
diff --git a/src/meta/meta-window-actor.h b/src/meta/meta-window-actor.h
index ce6c64022..9f808a9ac 100644
--- a/src/meta/meta-window-actor.h
+++ b/src/meta/meta-window-actor.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_WINDOW_ACTOR_H_
diff --git a/src/meta/prefs.h b/src/meta/prefs.h
index 3ccaddb20..cc07d292c 100644
--- a/src/meta/prefs.h
+++ b/src/meta/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/meta/screen.h b/src/meta/screen.h
index 88a3481a4..6e0cde7ee 100644
--- a/src/meta/screen.h
+++ b/src/meta/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/meta/theme.h b/src/meta/theme.h
index 5ecb76c3f..c813ee299 100644
--- a/src/meta/theme.h
+++ b/src/meta/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/meta/types.h b/src/meta/types.h
index f13471146..cd6af2b63 100644
--- a/src/meta/types.h
+++ b/src/meta/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/meta/util.h b/src/meta/util.h
index 091f4f9c7..4644de5a1 100644
--- a/src/meta/util.h
+++ b/src/meta/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/meta/window.h b/src/meta/window.h
index d2fb3a740..ff2d037d3 100644
--- a/src/meta/window.h
+++ b/src/meta/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/meta/workspace.h b/src/meta/workspace.h
index 972177060..54b3858a0 100644
--- a/src/meta/workspace.h
+++ b/src/meta/workspace.h
@@ -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/>.
  */
 
 #ifndef META_WORKSPACE_H
diff --git a/src/ui/draw-workspace.c b/src/ui/draw-workspace.c
index 58cff001a..2d5662993 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 7aa04918f..5c3a5359e 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/frames.c b/src/ui/frames.c
index 63f18379d..d69224ece 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 3298fc2cf..c0618f399 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 6017f65a6..e3ce60bb5 100644
--- a/src/ui/gradient.c
+++ b/src/ui/gradient.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/>.  */
 
 /**
  * SECTION:gradient
diff --git a/src/ui/menu.c b/src/ui/menu.c
index 34ceeb7a0..d59e24211 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 adcf32813..ab42a8ba9 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 affec99d8..be65b3537 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 c90c47a90..cebd6eb77 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/resizepopup.c b/src/ui/resizepopup.c
index bcce02d8a..ed793cde0 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/resizepopup.h b/src/ui/resizepopup.h
index 0e307dac4..e5096387f 100644
--- a/src/ui/resizepopup.h
+++ b/src/ui/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/ui/tabpopup.c b/src/ui/tabpopup.c
index c8dbeeaa4..285e29573 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/tabpopup.h b/src/ui/tabpopup.h
index ee609d9c8..ba324964a 100644
--- a/src/ui/tabpopup.h
+++ b/src/ui/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/ui/testgradient.c b/src/ui/testgradient.c
index c66c9e52f..fdc9576f9 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 <meta/gradient.h>
 #include <gtk/gtk.h>
diff --git a/src/ui/theme-parser.c b/src/ui/theme-parser.c
index 00942b03a..e9ce02827 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-private.h b/src/ui/theme-private.h
index 7e521e0f3..269f30e3e 100644
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-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_THEME_PRIVATE_H
diff --git a/src/ui/theme.c b/src/ui/theme.c
index 17eee4728..51255ee92 100644
--- a/src/ui/theme.c
+++ b/src/ui/theme.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/>.
  */
 
 /*
diff --git a/src/ui/tile-preview.c b/src/ui/tile-preview.c
index 61a438578..8fbf46884 100644
--- a/src/ui/tile-preview.c
+++ b/src/ui/tile-preview.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/tile-preview.h b/src/ui/tile-preview.h
index 8152a60ee..352483fa3 100644
--- a/src/ui/tile-preview.h
+++ b/src/ui/tile-preview.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_TILE_PREVIEW_H
 #define META_TILE_PREVIEW_H
diff --git a/src/ui/ui.c b/src/ui/ui.c
index ed2c66d13..50f9071f1 100644
--- a/src/ui/ui.c
+++ b/src/ui/ui.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/ui.h b/src/ui/ui.h
index e397c43d0..07bf77edd 100644
--- a/src/ui/ui.h
+++ b/src/ui/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/test/mutter-test b/test/mutter-test
index 463e0ba91..2266c2f34 100644
--- a/test/mutter-test
+++ b/test/mutter-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 728fa7c3a..42a8844e6 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 fbfbdefd8..107d9ee4a 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 a5187873e..edfc58764 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 f3e15ea12..0ec68b71d 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 f1bb65b0d..c5e80c62f 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 5a7e32667..3971cbca2 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
@@ -123,8 +121,7 @@ License:
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+   along with this package; if not, see <http://www.gnu.org/licenses/>.
 
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/tools/release-wrangler.py b/tools/release-wrangler.py
index 548af7fe2..1dcd5fe33 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