diff --git a/README b/README
--- a/README
+++ b/README
@@ -5,6 +5,6 @@ Basic install:
  $ hg debuginstall # sanity-check setup
  $ hg              # see help
 
-See http://www.selenic.com/mercurial/ for detailed installation
+See http://mercurial.selenic.com/ for detailed installation
 instructions, platform-specific notes, and Mercurial user information.
 
diff --git a/contrib/macosx/Readme.html b/contrib/macosx/Readme.html
--- a/contrib/macosx/Readme.html
+++ b/contrib/macosx/Readme.html
@@ -25,13 +25,13 @@
 <p class="p2"><br></p>
 <p class="p1"><b>Documentation</b></p>
 <p class="p2"><br></p>
-<p class="p3">Visit the <a href="http://www.selenic.com/mercurial">Mercurial web site and wiki</a></p>
+<p class="p3">Visit the <a href="http://mercurial.selenic.com/">Mercurial web site and wiki</a></p>
 <p class="p2"><br></p>
 <p class="p3">There's also a free book, <a href="http://hgbook.red-bean.com/">Distributed revision control with Mercurial</a></p>
 <p class="p2"><br></p>
 <p class="p1"><b>Reporting problems</b></p>
 <p class="p2"><br></p>
 <p class="p3">If you run into any problems, please file a bug online:</p>
-<p class="p3"><a href="http://www.selenic.com/mercurial/bts">http://www.selenic.com/mercurial/bts</a></p>
+<p class="p3"><a href="http://mercurial.selenic.com/bts/">http://mercurial.selenic.com/bts/</a></p>
 </body>
 </html>
diff --git a/contrib/macosx/Welcome.html b/contrib/macosx/Welcome.html
--- a/contrib/macosx/Welcome.html
+++ b/contrib/macosx/Welcome.html
@@ -11,10 +11,10 @@
   </style>
 </head>
 <body>
-<p class="p1">This is a prepackaged release of <a href="http://www.selenic.com/mercurial">Mercurial</a> for Mac OS X.</p>
+<p class="p1">This is a prepackaged release of <a href="http://mercurial.selenic.com/">Mercurial</a> for Mac OS X.</p>
 <p class="p2"><br></p>
 <br>
 <p>
-Please be sure to read the latest <a href="http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew">release notes</a>.</p>
+Please be sure to read the latest <a href="http://mercurial.selenic.com/wiki/WhatsNew">release notes</a>.</p>
 </body>
 </html>
diff --git a/contrib/mercurial.spec b/contrib/mercurial.spec
--- a/contrib/mercurial.spec
+++ b/contrib/mercurial.spec
@@ -4,8 +4,8 @@ Version: snapshot
 Release: 0
 License: GPL
 Group: Development/Tools
-Source: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
-URL: http://www.selenic.com/mercurial
+Source: http://mercurial.selenic.com/release/%{name}-%{version}.tar.gz
+URL: http://mercurial.selenic.com
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 # From the README:
diff --git a/contrib/vim/hgcommand.vim b/contrib/vim/hgcommand.vim
--- a/contrib/vim/hgcommand.vim
+++ b/contrib/vim/hgcommand.vim
@@ -1226,7 +1226,7 @@ finish
 
 Author:  Mathieu Clabaut <mathieu.clabaut@gmail.com>
 Credits:  Bob Hiestand <bob.hiestand@gmail.com>
-Mercurial: http://www.selenic.com/mercurial
+Mercurial: http://mercurial.selenic.com/
    Mercurial (noted Hg) is a fast, lightweight Source Control Management
    system designed for efficient handling of very large distributed projects.
 
diff --git a/contrib/win32/ReadMe.html b/contrib/win32/ReadMe.html
--- a/contrib/win32/ReadMe.html
+++ b/contrib/win32/ReadMe.html
@@ -49,7 +49,7 @@
 
     <p>
       For documentation, please visit the <a
-      href="http://www.selenic.com/mercurial">Mercurial web site</a>.
+      href="http://mercurial.selenic.com/">Mercurial web site</a>.
       You can also download a free book, <a
       href="http://hgbook.red-bean.com/">Mercurial: The Definitive
       Guide</a>.
@@ -100,7 +100,7 @@ editor = whatever
       By default, Mercurial will use the merge program defined by the
       <tt>HGMERGE</tt> environment variable, or uses the one defined
       in the <tt>mercurial.ini</tt> file. (see <a
-      href="http://www.selenic.com/mercurial/wiki/index.cgi/MergeProgram">MergeProgram</a>
+      href="http://mercurial.selenic.com/wiki/MergeProgram">MergeProgram</a>
       on the Mercurial Wiki for more information)
     </p>
 
@@ -108,9 +108,9 @@ editor = whatever
 
     <p>
       Before you report any problems, please consult the <a
-      href="http://www.selenic.com/mercurial">Mercurial web site</a>
+      href="http://mercurial.selenic.com/">Mercurial web site</a>
       and see if your question is already in our list of <a
-      href="http://www.selenic.com/mercurial/wiki/index.cgi/FAQ">Frequently
+      href="http://mercurial.selenic.com/wiki/FAQ">Frequently
       Answered Questions</a> (the "FAQ").
     </p>
 
diff --git a/contrib/win32/mercurial.iss b/contrib/win32/mercurial.iss
--- a/contrib/win32/mercurial.iss
+++ b/contrib/win32/mercurial.iss
@@ -8,9 +8,9 @@ InfoAfterFile=contrib/win32/postinstall.
 LicenseFile=COPYING
 ShowLanguageDialog=yes
 AppPublisher=Matt Mackall and others
-AppPublisherURL=http://www.selenic.com/mercurial
-AppSupportURL=http://www.selenic.com/mercurial
-AppUpdatesURL=http://www.selenic.com/mercurial
+AppPublisherURL=http://mercurial.selenic.com/
+AppSupportURL=http://mercurial.selenic.com/
+AppUpdatesURL=http://mercurial.selenic.com/
 AppID={{4B95A5F1-EF59-4B08-BED8-C891C46121B3}
 AppContact=mercurial@selenic.com
 OutputBaseFilename=Mercurial-snapshot
@@ -51,7 +51,7 @@ Source: CONTRIBUTORS; DestDir: {app}; De
 Source: COPYING; DestDir: {app}; DestName: Copying.txt
 
 [INI]
-Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://www.selenic.com/mercurial/
+Filename: {app}\Mercurial.url; Section: InternetShortcut; Key: URL; String: http://mercurial.selenic.com/
 
 [UninstallDelete]
 Type: files; Name: {app}\Mercurial.url
diff --git a/contrib/win32/postinstall.txt b/contrib/win32/postinstall.txt
--- a/contrib/win32/postinstall.txt
+++ b/contrib/win32/postinstall.txt
@@ -6,4 +6,4 @@ file that comes with this package.
 
 Also check the release notes at:
 
- http://www.selenic.com/mercurial/wiki/index.cgi/WhatsNew
+ http://mercurial.selenic.com/wiki/WhatsNew
diff --git a/doc/hg.1.txt b/doc/hg.1.txt
--- a/doc/hg.1.txt
+++ b/doc/hg.1.txt
@@ -75,7 +75,7 @@ Written by Matt Mackall <mpm@selenic.com
 
 RESOURCES
 ---------
-http://selenic.com/mercurial[Main Web Site]
+http://mercurial.selenic.com/[Main Web Site]
 
 http://selenic.com/hg[Source code repository]
 
diff --git a/doc/ja/hg.1.ja.txt b/doc/ja/hg.1.ja.txt
--- a/doc/ja/hg.1.ja.txt
+++ b/doc/ja/hg.1.ja.txt
@@ -852,7 +852,7 @@ Matt Mackall <mpm@selenic.com> により書かれました。
 
 情報源
 ---
-http://selenic.com/mercurial[主なウェブサイト]
+http://mercurial.selenic.com/[主なウェブサイト]
 
 http://www.serpentine.com/mercurial[Wiki サイト]
 
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -15,7 +15,7 @@
 # audience not running a version control system.
 #
 # For in-depth discussion refer to
-# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
+# <http://mercurial.selenic.com/wiki/KeywordPlan>.
 #
 # Keyword expansion is based on Mercurial's changeset template mappings.
 #
diff --git a/hgext/purge.py b/hgext/purge.py
--- a/hgext/purge.py
+++ b/hgext/purge.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2006 - Marco Barisione <marco@barisione.org>
 #
-# This is a small extension for Mercurial (http://www.selenic.com/mercurial)
+# This is a small extension for Mercurial (http://mercurial.selenic.com/)
 # that removes files not known to mercurial
 #
 # This program was inspired by the "cvspurge" script contained in CVS utilities
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -11,7 +11,7 @@ This extension lets you rebase changeset
 repository.
 
 For more information:
-http://www.selenic.com/mercurial/wiki/index.cgi/RebaseProject
+http://mercurial.selenic.com/wiki/RebaseProject
 '''
 
 from mercurial import util, repair, merge, cmdutil, commands, error
diff --git a/hgext/win32text.py b/hgext/win32text.py
--- a/hgext/win32text.py
+++ b/hgext/win32text.py
@@ -48,7 +48,7 @@ def checknewline(s, newline, ui=None, re
     # warn if already has 'newline' in repository.
     # it might cause unexpected eol conversion.
     # see issue 302:
-    #   http://www.selenic.com/mercurial/bts/issue302
+    #   http://mercurial.selenic.com/bts/issue302
     if newline in s and ui and filename and repo:
         ui.warn(_('WARNING: %s already has %s line endings\n'
                   'and does not need EOL conversion by the win32text plugin.\n'
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -987,7 +987,7 @@ def debuginstall(ui):
                        " or misconfigured. Please check your .hgrc file)\n"))
         else:
             ui.write(_(" Internal patcher failure, please report this error"
-                       " to http://www.selenic.com/mercurial/bts\n"))
+                       " to http://mercurial.selenic.com/bts/\n"))
     problems += patchproblems
 
     os.unlink(fa)
diff --git a/mercurial/dispatch.py b/mercurial/dispatch.py
--- a/mercurial/dispatch.py
+++ b/mercurial/dispatch.py
@@ -143,7 +143,7 @@ def _runcatch(ui, args):
     except:
         ui.warn(_("** unknown exception encountered, details follow\n"))
         ui.warn(_("** report bug details to "
-                 "http://www.selenic.com/mercurial/bts\n"))
+                 "http://mercurial.selenic.com/bts/\n"))
         ui.warn(_("** or mercurial@selenic.com\n"))
         ui.warn(_("** Mercurial Distributed SCM (version %s)\n")
                % util.version())
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -255,7 +255,7 @@ setup(name='mercurial',
       version=version,
       author='Matt Mackall',
       author_email='mpm@selenic.com',
-      url='http://selenic.com/mercurial',
+      url='http://mercurial.selenic.com/',
       description='Scalable distributed SCM',
       license='GNU GPL',
       scripts=scripts,
diff --git a/templates/atom/error.tmpl b/templates/atom/error.tmpl
--- a/templates/atom/error.tmpl
+++ b/templates/atom/error.tmpl
@@ -7,7 +7,7 @@
  <updated>1970-01-01T00:00:00+00:00</updated>
  <entry>
   <title>Error</title>
-  <id>http://www.selenic.com/mercurial/#error</id>
+  <id>http://mercurial.selenic.com/#error</id>
   <author>
     <name>mercurial</name>
   </author>
diff --git a/templates/gitweb/branches.tmpl b/templates/gitweb/branches.tmpl
--- a/templates/gitweb/branches.tmpl
+++ b/templates/gitweb/branches.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/changelog.tmpl b/templates/gitweb/changelog.tmpl
--- a/templates/gitweb/changelog.tmpl
+++ b/templates/gitweb/changelog.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
 </div>
 
 <form action="{url}log">
diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl
--- a/templates/gitweb/changeset.tmpl
+++ b/templates/gitweb/changeset.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/error.tmpl b/templates/gitweb/error.tmpl
--- a/templates/gitweb/error.tmpl
+++ b/templates/gitweb/error.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl
--- a/templates/gitweb/fileannotate.tmpl
+++ b/templates/gitweb/fileannotate.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/filediff.tmpl b/templates/gitweb/filediff.tmpl
--- a/templates/gitweb/filediff.tmpl
+++ b/templates/gitweb/filediff.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/filelog.tmpl b/templates/gitweb/filelog.tmpl
--- a/templates/gitweb/filelog.tmpl
+++ b/templates/gitweb/filelog.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revisions
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revisions
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl
--- a/templates/gitweb/filerevision.tmpl
+++ b/templates/gitweb/filerevision.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/graph.tmpl b/templates/gitweb/graph.tmpl
--- a/templates/gitweb/graph.tmpl
+++ b/templates/gitweb/graph.tmpl
@@ -9,7 +9,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
 </div>
 
 <form action="{url}log">
diff --git a/templates/gitweb/index.tmpl b/templates/gitweb/index.tmpl
--- a/templates/gitweb/index.tmpl
+++ b/templates/gitweb/index.tmpl
@@ -4,7 +4,7 @@
 <body>
 
 <div class="page_header">
-    <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a>
+    <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a>
     Repositories list
 </div>
 
diff --git a/templates/gitweb/manifest.tmpl b/templates/gitweb/manifest.tmpl
--- a/templates/gitweb/manifest.tmpl
+++ b/templates/gitweb/manifest.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files
 </div>
 
 <div class="page_nav">
diff --git a/templates/gitweb/notfound.tmpl b/templates/gitweb/notfound.tmpl
--- a/templates/gitweb/notfound.tmpl
+++ b/templates/gitweb/notfound.tmpl
@@ -5,7 +5,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
 </div>
 
 <div class="page_body">
diff --git a/templates/gitweb/search.tmpl b/templates/gitweb/search.tmpl
--- a/templates/gitweb/search.tmpl
+++ b/templates/gitweb/search.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / search
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / search
 
 <form action="{url}log">
 {sessionvars%hiddenformentry}
diff --git a/templates/gitweb/shortlog.tmpl b/templates/gitweb/shortlog.tmpl
--- a/templates/gitweb/shortlog.tmpl
+++ b/templates/gitweb/shortlog.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / shortlog
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / shortlog
 </div>
 
 <form action="{url}log">
diff --git a/templates/gitweb/summary.tmpl b/templates/gitweb/summary.tmpl
--- a/templates/gitweb/summary.tmpl
+++ b/templates/gitweb/summary.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
 
 <form action="{url}log">
 {sessionvars%hiddenformentry}
diff --git a/templates/gitweb/tags.tmpl b/templates/gitweb/tags.tmpl
--- a/templates/gitweb/tags.tmpl
+++ b/templates/gitweb/tags.tmpl
@@ -8,7 +8,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags
 </div>
 
 <div class="page_nav">
diff --git a/templates/monoblue/footer.tmpl b/templates/monoblue/footer.tmpl
--- a/templates/monoblue/footer.tmpl
+++ b/templates/monoblue/footer.tmpl
@@ -8,7 +8,7 @@
     </div>
 
     <div id="powered-by">
-        <p><a href="http://www.selenic.com/mercurial/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
+        <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
     </div>
 
     <div id="corner-top-left"></div>
diff --git a/templates/monoblue/index.tmpl b/templates/monoblue/index.tmpl
--- a/templates/monoblue/index.tmpl
+++ b/templates/monoblue/index.tmpl
@@ -26,7 +26,7 @@
     </div>
 
     <div id="powered-by">
-        <p><a href="http://www.selenic.com/mercurial/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
+        <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
     </div>
 
     <div id="corner-top-left"></div>
diff --git a/templates/paper/branches.tmpl b/templates/paper/branches.tmpl
--- a/templates/paper/branches.tmpl
+++ b/templates/paper/branches.tmpl
@@ -10,7 +10,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/changeset.tmpl b/templates/paper/changeset.tmpl
--- a/templates/paper/changeset.tmpl
+++ b/templates/paper/changeset.tmpl
@@ -5,7 +5,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/error.tmpl b/templates/paper/error.tmpl
--- a/templates/paper/error.tmpl
+++ b/templates/paper/error.tmpl
@@ -6,7 +6,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/fileannotate.tmpl b/templates/paper/fileannotate.tmpl
--- a/templates/paper/fileannotate.tmpl
+++ b/templates/paper/fileannotate.tmpl
@@ -6,7 +6,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/filediff.tmpl b/templates/paper/filediff.tmpl
--- a/templates/paper/filediff.tmpl
+++ b/templates/paper/filediff.tmpl
@@ -6,7 +6,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/filelog.tmpl b/templates/paper/filelog.tmpl
--- a/templates/paper/filelog.tmpl
+++ b/templates/paper/filelog.tmpl
@@ -10,7 +10,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/filerevision.tmpl b/templates/paper/filerevision.tmpl
--- a/templates/paper/filerevision.tmpl
+++ b/templates/paper/filerevision.tmpl
@@ -6,7 +6,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/graph.tmpl b/templates/paper/graph.tmpl
--- a/templates/paper/graph.tmpl
+++ b/templates/paper/graph.tmpl
@@ -11,7 +11,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/index.tmpl b/templates/paper/index.tmpl
--- a/templates/paper/index.tmpl
+++ b/templates/paper/index.tmpl
@@ -5,7 +5,7 @@
 
 <div class="container">
 <div class="menu">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <div class="main">
diff --git a/templates/paper/manifest.tmpl b/templates/paper/manifest.tmpl
--- a/templates/paper/manifest.tmpl
+++ b/templates/paper/manifest.tmpl
@@ -6,7 +6,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/search.tmpl b/templates/paper/search.tmpl
--- a/templates/paper/search.tmpl
+++ b/templates/paper/search.tmpl
@@ -6,7 +6,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
 <ul>
diff --git a/templates/paper/shortlog.tmpl b/templates/paper/shortlog.tmpl
--- a/templates/paper/shortlog.tmpl
+++ b/templates/paper/shortlog.tmpl
@@ -10,7 +10,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/paper/tags.tmpl b/templates/paper/tags.tmpl
--- a/templates/paper/tags.tmpl
+++ b/templates/paper/tags.tmpl
@@ -10,7 +10,7 @@
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/templates/rss/error.tmpl b/templates/rss/error.tmpl
--- a/templates/rss/error.tmpl
+++ b/templates/rss/error.tmpl
@@ -4,7 +4,7 @@
     <item>
       <title>Error</title>
       <description>{error|escape}</description>
-      <guid>http://www.selenic.com/mercurial/#error</guid>
+      <guid>http://mercurial.selenic.com/#error</guid>
     </item>
   </channel>
 </rss>
diff --git a/templates/spartan/footer.tmpl b/templates/spartan/footer.tmpl
--- a/templates/spartan/footer.tmpl
+++ b/templates/spartan/footer.tmpl
@@ -1,6 +1,6 @@
 {motd}
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
 
diff --git a/tests/README b/tests/README
--- a/tests/README
+++ b/tests/README
@@ -3,5 +3,5 @@ To run the tests, do:
 cd tests/
 python run-tests.py
 
-See http://www.selenic.com/mercurial/wiki/index.cgi/WritingTests for
+See http://mercurial.selenic.com/wiki/WritingTests for
 more information on writing tests.
diff --git a/tests/test-bundle b/tests/test-bundle
--- a/tests/test-bundle
+++ b/tests/test-bundle
@@ -103,7 +103,7 @@ hg clone full.hg full-clone
 hg -R full-clone heads
 rm -r full-clone
 
-# test for http://www.selenic.com/mercurial/bts/issue216
+# test for http://mercurial.selenic.com/bts/issue216
 echo "====== Unbundle incremental bundles into fresh empty in one go"
 rm -r empty
 hg init empty
@@ -131,7 +131,7 @@ cd ../orig
 hg incoming ../bundle.hg
 cd ..
 
-# test for http://www.selenic.com/mercurial/bts/issue1144
+# test for http://mercurial.selenic.com/bts/issue1144
 echo "===== test that verify bundle does not traceback"
 # partial history bundle, fails w/ unkown parent
 hg -R bundle.hg verify
diff --git a/tests/test-convert-cvs-branch b/tests/test-convert-cvs-branch
--- a/tests/test-convert-cvs-branch
+++ b/tests/test-convert-cvs-branch
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# This is http://www.selenic.com/mercurial/bts/issue1148
-#     and http://www.selenic.com/mercurial/bts/issue1447
+# This is http://mercurial.selenic.com/bts/issue1148
+#     and http://mercurial.selenic.com/bts/issue1447
 
 "$TESTDIR/hghave" cvs || exit 80
 
diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out
--- a/tests/test-hgweb-commands.out
+++ b/tests/test-hgweb-commands.out
@@ -172,7 +172,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -251,7 +251,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -378,7 +378,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -502,7 +502,7 @@ 200 Script output follows
 <body>
 
 <div class="page_header">
-<a href="http://127.0.0.1/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / branches
+<a href="http://127.0.0.1/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / branches
 </div>
 
 <div class="page_nav">
@@ -573,7 +573,7 @@ 200 Script output follows
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / summary
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / summary
 
 <form action="/log">
 <input type="hidden" name="style" value="gitweb" />
@@ -724,7 +724,7 @@ 200 Script output follows
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / graph
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="/summary?style=gitweb">test</a> / graph
 </div>
 
 <form action="/log">
diff --git a/tests/test-hgweb-descend-empties.out b/tests/test-hgweb-descend-empties.out
--- a/tests/test-hgweb-descend-empties.out
+++ b/tests/test-hgweb-descend-empties.out
@@ -21,7 +21,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/tests/test-hgweb-diffs.out b/tests/test-hgweb-diffs.out
--- a/tests/test-hgweb-diffs.out
+++ b/tests/test-hgweb-diffs.out
@@ -19,7 +19,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -112,7 +112,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -201,7 +201,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -296,7 +296,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/tests/test-hgweb-empty.out b/tests/test-hgweb-empty.out
--- a/tests/test-hgweb-empty.out
+++ b/tests/test-hgweb-empty.out
@@ -18,7 +18,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -87,7 +87,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -157,7 +157,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -296,7 +296,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/tests/test-hgweb-filelog.out b/tests/test-hgweb-filelog.out
--- a/tests/test-hgweb-filelog.out
+++ b/tests/test-hgweb-filelog.out
@@ -106,7 +106,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -189,7 +189,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -272,7 +272,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -350,7 +350,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -424,7 +424,7 @@ 404 Not Found
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <ul>
@@ -559,7 +559,7 @@ b@1e88685f5dde
 
 
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
 </div>
 
diff --git a/tests/test-hgweb-removed.out b/tests/test-hgweb-removed.out
--- a/tests/test-hgweb-removed.out
+++ b/tests/test-hgweb-removed.out
@@ -17,7 +17,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -106,7 +106,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/tests/test-hgweb.out b/tests/test-hgweb.out
--- a/tests/test-hgweb.out
+++ b/tests/test-hgweb.out
@@ -35,7 +35,7 @@ 404 Not Found
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <ul>
@@ -105,7 +105,7 @@ 404 Not Found
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/tests/test-hgwebdir.out b/tests/test-hgwebdir.out
--- a/tests/test-hgwebdir.out
+++ b/tests/test-hgwebdir.out
@@ -56,7 +56,7 @@ 200 Script output follows
 
 <div class="container">
 <div class="menu">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <div class="main">
@@ -192,7 +192,7 @@ 200 Script output follows
 
 <div class="container">
 <div class="menu">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
 </div>
 <div class="main">
diff --git a/tests/test-highlight.out b/tests/test-highlight.out
--- a/tests/test-highlight.out
+++ b/tests/test-highlight.out
@@ -19,7 +19,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -137,7 +137,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
@@ -224,7 +224,7 @@ 200 Script output follows
 <div class="container">
 <div class="menu">
 <div class="logo">
-<a href="http://www.selenic.com/mercurial/">
+<a href="http://mercurial.selenic.com/">
 <img src="/static/hglogo.png" alt="mercurial" /></a>
 </div>
 <ul>
diff --git a/tests/test-issue322 b/tests/test-issue322
--- a/tests/test-issue322
+++ b/tests/test-issue322
@@ -1,5 +1,5 @@
 #!/bin/sh
-# http://www.selenic.com/mercurial/bts/issue322
+# http://mercurial.selenic.com/bts/issue322
 
 echo % file replaced with directory
 
diff --git a/tests/test-issue352 b/tests/test-issue352
--- a/tests/test-issue352
+++ b/tests/test-issue352
@@ -1,5 +1,5 @@
 #!/bin/sh
-# http://www.selenic.com/mercurial/bts/issue352
+# http://mercurial.selenic.com/bts/issue352
 
 "$TESTDIR/hghave" eol-in-paths || exit 80
 
diff --git a/tests/test-issue433 b/tests/test-issue433
--- a/tests/test-issue433
+++ b/tests/test-issue433
@@ -1,5 +1,5 @@
 #!/bin/sh
-# http://www.selenic.com/mercurial/bts/issue433
+# http://mercurial.selenic.com/bts/issue433
 
 hg init a
 cd a
diff --git a/tests/test-issue660 b/tests/test-issue660
--- a/tests/test-issue660
+++ b/tests/test-issue660
@@ -1,5 +1,5 @@
 #!/bin/sh
-# http://www.selenic.com/mercurial/bts/issue660
+# http://mercurial.selenic.com/bts/issue660
 
 
 hg init a