diff --git a/contrib/mercurial.el b/contrib/mercurial.el
--- a/contrib/mercurial.el
+++ b/contrib/mercurial.el
@@ -15,8 +15,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with mercurial.el, GNU Emacs, or XEmacs; see the file COPYING
-;; (`C-h C-l').  If not, write to the Free Software Foundation, Inc.,
-;; 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+;; (`C-h C-l').  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/contrib/mq.el b/contrib/mq.el
--- a/contrib/mq.el
+++ b/contrib/mq.el
@@ -15,8 +15,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with mq.el, GNU Emacs, or XEmacs; see the file COPYING (`C-h
-;; C-l').  If not, write to the Free Software Foundation, Inc., 59
-;; Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+;; C-l').  If not, see <http://www.gnu.org/licenses/>.
 
 (eval-when-compile (require 'cl))
 (require 'mercurial)
diff --git a/contrib/wix/COPYING.rtf b/contrib/wix/COPYING.rtf
index 3418a971bda38b613fc6ffc74c9652fc026dad40..317422642526a951405f50ba6bbfe74b8c0e8efc
GIT binary patch
literal 1686
zc$|$@QE%He5Z-fu{)a<f))tv9sqsVSVSra8jnTw0YzKt_zR(h7-Aa)PN!c(A|M%Td
z^5SB^Ho%}Q@$SCwzWYcYg$rdWr12P+yxFGNC=-P$%Y;`g%{EQ4o1-YL31Oq@M<Pmt
zT9kPuomU}&71qkbOzmM|YiY)()0?ZK$gQ@HGGHv6DiX1EN|{7#bgQz_XdGich^;cp
z$zUBk`ZA~j1B?bY=^&%eDETx#i5;r_cQnO~X!BGw(iKAED9wb6tJm30LTlaXkcyW-
zMMwGL$4Jy?2|Oy7w+^KS@w5B{S(1!?$&!>dWC*n6-=)?dO#wDk%6Z0kbM?A*cxl8-
zg_l&|AE*}~=%J)m!P_$IrBh=#*cNhWfMh@)9B$g6fEp#pAvIpx0?PxxXicFU5D5s%
z)gEjaAHK|<;Y-v>!@S*S%;5oZWxN9Eq2V{aQUz=dG5n6vmpwY%S*j`nS~CWP+#u|z
zNqUCt4A57*24eG01}5ylHk|aHSRO#j@R~R1q*+m7<LuT+V#-Lb%@u$q7OreVy;M|^
zo(`}_5_+Sc^{Q<3HBc;ko38Gko>wrLt>N2bv6#$O>oG-!%F?ddsjd>%jYcX=JvnK@
zfvG><E<WE={N#`6!*sP~_IK0O>~^_?yQc+AU_M!_rk|f5CJUH9FXm6n+n)Q>fU&VS
zi>{UTG@O?fU8kaK2rQQyt*G-o*Olzv0)pkv_6`G@ZPyOVliTLta9agxSknljkh~EM
z1q4Zi_mzcO9?s+LhyQ~o!iA*QER@Dbf?(N0CB+xAmRm);XmZ^aOoM^CV?>hrM&-yq
zXdesek32(ZxuyBOwDimt?TgUV&~pV=y0-$2hU3x54QeFXgw5|RslmHfa2}ztftc19
zI)$|L(YoY136U~=Zxly6#SV}DkU5<fvK2>g2GQ}Y4-!o`18&&zVL(?z1(70HRwyOv
zmi*Q;{+ks+ligxXw$J4N`jGe6ouRNKti0-{#Z@l{Rnei^&|L+x*r6vjXCPvUy(+e^
z&@0*7YN^zJ9oRA+cs?zPde!I5HFfLB@wy=Rog$%fg*(EQ(Om!MCeSuok{Tz?{JG~b
zH%kK|XArsHst}rAhr|7TKiHafVBL18y8?drd(VZgcvQOJ+qu*<WFL<A>-p{CVLJN?
wZ~F@M`Mw)?rIo>aklXt0>2%~A=XE%WR*Sq$;olNYr_=eG?y%`!;is#=06=b1jsO4v

diff --git a/hgext/convert/transport.py b/hgext/convert/transport.py
--- a/hgext/convert/transport.py
+++ b/hgext/convert/transport.py
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 from mercurial import util
 from svn.core import SubversionException, Pool
diff --git a/hgext/purge.py b/hgext/purge.py
--- a/hgext/purge.py
+++ b/hgext/purge.py
@@ -20,8 +20,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 '''command to delete untracked files from the working directory'''
 
diff --git a/hgext/zeroconf/Zeroconf.py b/hgext/zeroconf/Zeroconf.py
--- a/hgext/zeroconf/Zeroconf.py
+++ b/hgext/zeroconf/Zeroconf.py
@@ -17,8 +17,8 @@
     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/mercurial/byterange.py b/mercurial/byterange.py
--- a/mercurial/byterange.py
+++ b/mercurial/byterange.py
@@ -9,10 +9,8 @@
 #   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/>.
 
 # This file is part of urlgrabber, a high-level cross-protocol url-grabber
 # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko
diff --git a/mercurial/keepalive.py b/mercurial/keepalive.py
--- a/mercurial/keepalive.py
+++ b/mercurial/keepalive.py
@@ -9,10 +9,8 @@
 #   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/>.
 
 # This file is part of urlgrabber, a high-level cross-protocol url-grabber
 # Copyright 2002-2004 Michael D. Stenner, Ryan Tomayko
diff --git a/mercurial/simplemerge.py b/mercurial/simplemerge.py
--- a/mercurial/simplemerge.py
+++ b/mercurial/simplemerge.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 # mbp: "you know that thing where cvs gives you conflict markers?"
 # s: "i hate that."
diff --git a/tests/test-simplemerge.py b/tests/test-simplemerge.py
--- a/tests/test-simplemerge.py
+++ b/tests/test-simplemerge.py
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 import unittest
 from unittest import TestCase