diff --git a/.gitattributes b/.gitattributes
index 1d1623387926a5e68bdca69e94eacb0a5c01f8e2..13d152988c2f563e1129667e73444297c1603694 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -235,12 +235,10 @@ testfont binary
 /lib/modules/Tools.pmod/Standalone.pmod/process_files.pike foreign_ident
 /lib/modules/Tools.pmod/Standalone.pmod/rsif.pike foreign_ident
 /lib/modules/Tools.pmod/Standalone.pmod/rsqld.pike foreign_ident
-/lib/modules/Web.pmod/Crawler.pmod foreign_ident
 /lib/modules/Web.pmod/OWL.pike foreign_ident
 /lib/modules/Web.pmod/RDF.pike foreign_ident
 /lib/modules/Web.pmod/RDFS.pike foreign_ident
 /lib/modules/Web.pmod/RSS.pmod foreign_ident
-/lib/modules/Web.pmod/testsuite.in foreign_ident
 /lib/modules/Yabu.pmod/module.pmod foreign_ident
 /lib/modules/Yabu.pmod/testsuite.in foreign_ident
 /lib/modules/_Image.pmod/Dims.pmod foreign_ident
diff --git a/lib/master.pike.in b/lib/master.pike.in
index cecc48505f97122dea63244b7fce98df5ecdab84..1f08aa5e50740de7ca9ef880451e961ad715b3f1 100644
--- a/lib/master.pike.in
+++ b/lib/master.pike.in
@@ -3838,7 +3838,7 @@ void _main(array(string) orig_argv)
      case "info":
        write("Software......Pike\n"
 	     "Version......."+version()+"\n"
-	     "WWW...........http://pike.ida.liu.se/\n"
+	     "WWW...........http://pike.lysator.liu.se/\n"
 	     "\n"
 	     "pike binary..."+_pike_file_name+"\n"+
 	      format_paths() + "\n"
diff --git a/lib/modules/Protocols.pmod/DNS.pmod b/lib/modules/Protocols.pmod/DNS.pmod
index f8249657b7f0d1814d0c0447144f3b9c1425dc47..b2f79ce87de8f8a7b256534c24c64c8147dbc11c 100644
--- a/lib/modules/Protocols.pmod/DNS.pmod
+++ b/lib/modules/Protocols.pmod/DNS.pmod
@@ -269,8 +269,8 @@ class protocol
 //!  @[Protocols.DNS.client.do_sync_query]
 //!
 //! @example
-//! // generate a query PDU for a address lookup on the hostname pike.ida.liu.se
-//! string q=Protocols.DNS.protocol()->mkquery("pike.ida.liu.se", Protocols.DNS.C_IN, Protocols.DNS.T_A);
+//! // generate a query PDU for a address lookup on the hostname pike.lysator.liu.se
+//! string q=Protocols.DNS.protocol()->mkquery("pike.lysator.liu.se", Protocols.DNS.C_IN, Protocols.DNS.T_A);
   string mkquery(string|mapping dnameorquery, int|void cl, int|void type)
   {
     if(mappingp(dnameorquery))
@@ -1054,7 +1054,7 @@ class client
 //!   @code
 //!     // Perform a hostname lookup, results stored in r->an
 //!     object d=Protocols.DNS.client();
-//!     mapping r=d->do_sync_query(d->mkquery("pike.ida.liu.se", C_IN, T_A));
+//!     mapping r=d->do_sync_query(d->mkquery("pike.lysator.liu.se", C_IN, T_A));
 //!   @endcode
   mapping do_sync_query(string s)
   {
diff --git a/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike b/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
index 5249d0491d53b8804e4f592df05dd9c0c58224ed..7bce992ebcb90dde7ce72ae0b3cac884f710f23d 100644
--- a/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
+++ b/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
@@ -23,7 +23,7 @@
 //! int main()
 //! {
 //!    o->set_callbacks(ok, fail);
-//!    o->async_request("pike.ida.liu.se", 80, "HEAD / HTTP/1.0");
+//!    o->async_request("pike.lysator.liu.se", 80, "HEAD / HTTP/1.0");
 //!    return -1;
 //! }
 
diff --git a/lib/modules/Protocols.pmod/HTTP.pmod/module.pmod b/lib/modules/Protocols.pmod/HTTP.pmod/module.pmod
index a83147aef32ae1f054b72bce23c5d8880d653836..9a386070093458757f166dab71da1920d3306b09 100644
--- a/lib/modules/Protocols.pmod/HTTP.pmod/module.pmod
+++ b/lib/modules/Protocols.pmod/HTTP.pmod/module.pmod
@@ -105,7 +105,7 @@ constant DAV_STORAGE_FULL	= 507; // RFC 2518 10.6: Insufficient Storage
 //!   The HTTP method to use, e.g. @expr{"GET"@}.
 //! @param url
 //!   The URL to perform @[method] on. Should be a complete URL,
-//!   including protocol, e.g. @expr{"https://pike.ida.liu.se/"@}.
+//!   including protocol, e.g. @expr{"https://pike.lysator.liu.se/"@}.
 //! @param query_variables
 //!   Calls @[http_encode_query] and appends the result to the URL.
 //! @param request_headers
@@ -239,7 +239,7 @@ protected .Query do_udp_method(string method, Standards.URI url,
 //!   The HTTP method to use, e.g. @expr{"GET"@}.
 //! @param url
 //!   The URL to perform @[method] on. Should be a complete URL,
-//!   including protocol, e.g. @expr{"https://pike.ida.liu.se/"@}.
+//!   including protocol, e.g. @expr{"https://pike.lysator.liu.se/"@}.
 //! @param query_variables
 //!   Calls @[http_encode_query] and appends the result to the URL.
 //! @param request_headers
diff --git a/lib/modules/Search.pmod/Filter.pmod/Output.pike b/lib/modules/Search.pmod/Filter.pmod/Output.pike
index 64a46e97c694cef4acd2b9d0ef954a4aeae8497b..a8522cfe3343127899868ff9aee3ad6503fee1dc 100644
--- a/lib/modules/Search.pmod/Filter.pmod/Output.pike
+++ b/lib/modules/Search.pmod/Filter.pmod/Output.pike
@@ -17,7 +17,7 @@ mapping(string:string) fields=([]);
 int document_size;
 
 //! Maps un-normalized URLs to raw text, e.g.
-//! @expr{ ([ "http://pike.ida.liu.se": "Pike language" ]) @}.
+//! @expr{ ([ "http://pike.lysator.liu.se": "Pike language" ]) @}.
 mapping(string:string) uri_anchors=([]);
 
 //! All links collected from the document.
diff --git a/lib/modules/Web.pmod/Crawler.pmod b/lib/modules/Web.pmod/Crawler.pmod
index d047fa67eea63fcaef885cd45094a18b7b60698d..44ae31111846951199b8d906d3fbffce494f4e39 100644
--- a/lib/modules/Web.pmod/Crawler.pmod
+++ b/lib/modules/Web.pmod/Crawler.pmod
@@ -33,7 +33,7 @@
 //! @enddl
 
 // Author:  Johan Sch�n.
-// $Id: Crawler.pmod,v 1.28 2009/09/14 08:06:39 mast Exp $
+// $Id$
 
 #define CRAWLER_DEBUG
 #ifdef CRAWLER_DEBUG
@@ -228,7 +228,7 @@ class Rule
 //! @param pattern
 //!  a glob pattern that the rule will match against.
 //! @example
-//! GlobRule("http://pike.ida.liu.se/*.xml");
+//! GlobRule("http://pike.lysator.liu.se/*.xml");
 class GlobRule(string pattern)
 {
   inherit Rule;  
diff --git a/lib/modules/Web.pmod/testsuite.in b/lib/modules/Web.pmod/testsuite.in
index fe232679730df33b3e41d5a9a89826694a72ea94..ecfc80912dd4f2ba70a19af599df443b492f618b 100644
--- a/lib/modules/Web.pmod/testsuite.in
+++ b/lib/modules/Web.pmod/testsuite.in
@@ -1,5 +1,5 @@
 START_MARKER
-test_true([["$Id: testsuite.in,v 1.10 2004/05/02 18:24:04 nilsson Exp $"]]);
+test_true([["$Id$"]]);
 
 
 // - Web.RDF
@@ -14,7 +14,7 @@ test_any_equal([[
 		    r->URIResource("http://www.example.org/terms/creation-date"),
 		    y );
   r->add_statement( y,
-		    r->URIResource("http://pike.ida.liu.se/terms/ruppar"),
+		    r->URIResource("http://pike.lysator.liu.se/terms/ruppar"),
 		    r->LiteralResource("August 16, 1999") );
   r->add_statement( x,
 		    r->URIResource("http://www.example.org/terms/language"),
@@ -28,7 +28,7 @@ test_any_equal([[
     "RESOURCE <http://www.example.org/terms/language> \"English\" .",
     "RESOURCE <http://www.example.org/terms/creation-date> RESOURCE .",
     "<http://www.example.org/index.html> <http://purl.org/dc/elements/1.1/creator> RESOURCE .",
-    "RESOURCE <http://pike.ida.liu.se/terms/ruppar> \"August 16, 1999\" ."
+    "RESOURCE <http://pike.lysator.liu.se/terms/ruppar> \"August 16, 1999\" ."
 >))
 
 test_do([[ add_constant("my_rdf", Web.RDF()); ]])
diff --git a/refdoc/structure/modref.html b/refdoc/structure/modref.html
index d49667bf23266651ea375436ff2517bb5820445a..4ae86a738deda73ddcc83129829da2b8a4415cf0 100644
--- a/refdoc/structure/modref.html
+++ b/refdoc/structure/modref.html
@@ -12,8 +12,8 @@
   <tr>
     <td width="0%"><img src="$dotdot$/images/unit.gif" alt="" width="10" height="1"></td>
     <td width="1%">
-      <a href="http://pike.ida.liu.se/"><img src="$dotdot$/images/pike_logo.gif"
-      border="0" alt="pike.ida.liu.se" width="181" height="41" hspace="5"></a></td>
+      <a href="http://pike.lysator.liu.se/"><img src="$dotdot$/images/pike_logo.gif"
+      border="0" alt="pike.lysator.liu.se" width="181" height="41" hspace="5"></a></td>
     <td width="0%"><img src="$dotdot$/images/unit.gif" alt="" width="10" height="1"></td>
     <td width="99%">
       <table align="center" border="0" width="100%" cellspacing="0" cellpadding="0" valign="middle">
@@ -60,4 +60,4 @@
   </tr>
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/refdoc/structure/module_modref.html b/refdoc/structure/module_modref.html
index 02b0fb535e83007c60990795f84554bc78840bd9..0038cabb4db337c066a85dc1292e60aa68064cca 100644
--- a/refdoc/structure/module_modref.html
+++ b/refdoc/structure/module_modref.html
@@ -12,8 +12,8 @@
   <tr>
     <td width="0%"><img src="$dotdot$/images/unit.gif" alt="" width="10" height="1"></td>
     <td width="1%">
-      <a href="http://pike.ida.liu.se/"><img src="$dotdot$/images/pike_logo.gif"
-      border="0" alt="pike.ida.liu.se" width="181" height="41" hspace="5"></a></td>
+      <a href="http://pike.lysator.liu.se/"><img src="$dotdot$/images/pike_logo.gif"
+      border="0" alt="pike.lysator.liu.se" width="181" height="41" hspace="5"></a></td>
     <td width="0%"><img src="$dotdot$/images/unit.gif" alt="" width="10" height="1"></td>
     <td width="99%">
       <table align="center" border="0" width="100%" cellspacing="0" cellpadding="0" valign="middle">
diff --git a/refdoc/structure/pelix_modref.html b/refdoc/structure/pelix_modref.html
index 844491cdb7feb6c73d4ab5112c48880f928baeee..f0a70779de03477d1d72619d6910e5c35d0cd4d6 100644
--- a/refdoc/structure/pelix_modref.html
+++ b/refdoc/structure/pelix_modref.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html><head>
-  <title>pike.ida.liu.se: $title$</title>
-  <base href="http://pike.ida.liu.se/generated/manual/modref/$filename$" />
+  <title>pike.lysator.liu.se: $title$</title>
+  <base href="http://pike.lysator.liu.se/generated/manual/modref/$filename$" />
 
 <style type="text/css">
 body { font-family: arial, helvetica, sans-serif; font-size: 13px; }
@@ -19,7 +19,7 @@ td         { font-family: arial, helvetica, sans-serif; font-size: 13px; }
 
 <noindex><table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr><td width="0%"><img width="10" src="/R" height="1" alt=""></td>
-<td width="1%"><a href="/"><img hspace="5" border="0" width="181" src="/templates/img/pike_logo.gif" height="41" alt="pike.ida.liu.se"></a></td>
+<td width="1%"><a href="/"><img hspace="5" border="0" width="181" src="/templates/img/pike_logo.gif" height="41" alt="pike.lysator.liu.se"></a></td>
 <td width="0%"><img width="10" src="/R" height="1" alt=""></td>
 
 <td width="99%">