diff --git a/CHANGES b/CHANGES
index b188520656b366b321e6052620777908be44d514..fd8b8f1cc3f4aa84a33678ff31e0f619efeeb28e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,10 @@ Daniel Stenberg (28 Aug 2008)
   get locked again so this is now fixed.
   http://curl.haxx.se/mail/lib-2008-08/0422.html
 
+- I'm abandoning the system with the web site mirrors (but keeping download
+  files bing mirrored) and thus I've changed the URL in the cookiejar header
+  to no longer use curlm.haxx.se but instead use the main site curl.haxx.se
+
 Daniel Fandrich (27 Aug 2008)
 - Fixed test case 1065 by changing the handling of CURLOPT_UPLOAD to set
   the HTTP method to GET (or HEAD) when given a value of 0.
diff --git a/lib/cookie.c b/lib/cookie.c
index f2dabd8e20867a3fa826cb08a90014ac7b182dd3..93d088d7531cd859a9f1c8718db391745aaf1875 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -990,7 +990,7 @@ int Curl_cookie_output(struct CookieInfo *c, const char *dumphere)
     char *format_ptr;
 
     fputs("# Netscape HTTP Cookie File\n"
-          "# http://curlm.haxx.se/rfc/cookie_spec.html\n"
+          "# http://curl.haxx.se/rfc/cookie_spec.html\n"
           "# This file was generated by libcurl! Edit at your own risk.\n\n",
           out);
     co = c->cookies;
diff --git a/tests/data/test171 b/tests/data/test171
index 30c365af46b20ecc0f9d7146bd0fe432d1f8e50e..6b79588a5e82b95547d5ab92e1eb209831dcc656 100644
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -49,7 +49,7 @@ Proxy-Connection: Keep-Alive
 </protocol>
 <file name="log/jar171" mode="text">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .z.x.com	TRUE	/	FALSE	0	XToken	xt
diff --git a/tests/data/test172 b/tests/data/test172
index bb1689ba94ce129b964fd19e2945cce023fdbc05..1ab902011348fd61f213f934e6badd5eddc0cb8e 100644
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -31,7 +31,7 @@ http://%HOSTIP:%HTTPPORT/we/want/172 -b log/jar172.txt -b "tool=curl; name=fool"
 </command>
 <file name="log/jar172.txt">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .%HOSTIP	TRUE	/silly/	FALSE	0	ismatch	this
diff --git a/tests/data/test31 b/tests/data/test31
index 444a9b13e3e02a0d881eb27011f9cce70a6f8f8f..0432f56f9dda20e96ac4dd6fbe905d6e7d784a4b 100644
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -64,7 +64,7 @@ Accept: */*
 </protocol>
 <file name="log/jar31.txt" mode="text">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .127.0.0.1	TRUE	/silly/	FALSE	0	ismatch	this
diff --git a/tests/data/test46 b/tests/data/test46
index 0c5c8767638a797613d40cfda9954bfe04ccefce..d0d193033bd070c7c17b6139f81d05abc621af9d 100644
--- a/tests/data/test46
+++ b/tests/data/test46
@@ -46,7 +46,7 @@ TZ=GMT
 </command>
 <file name="log/injar46">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This is generated by libcurl!  Do not edit.
 
 www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
@@ -71,7 +71,7 @@ Cookie: empty=; mooo2=indeed2; mooo=indeed
 </protocol>
 <file name="log/jar46" mode="text">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 www.fake.come	FALSE	/	FALSE	1022144953	cookiecliente	si
diff --git a/tests/data/test506 b/tests/data/test506
index a90c8d984c3e372d37916c615728ab2ffa6bf4ec..878744f37d5c560a04e3bb516594347f743471e3 100644
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -168,7 +168,7 @@ http://%HOSTIP:%HTTPPORT/506
 </stderr>
 <file name="log/jar506" mode="text">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .foo.com	TRUE	/	FALSE	1993463787	test1	overwritten1
diff --git a/tests/data/test61 b/tests/data/test61
index 93c95d38e006bb8536bf2889b238383c0b00f1b4..410119de88b9ecdccf14c03b085567c38ea69e19 100644
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -59,7 +59,7 @@ Host: www.host.foo.com
 </protocol>
 <file name="log/jar61.txt" mode="text">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .foo.com	TRUE	/we/want/	FALSE	2054030187	test	yes
diff --git a/tests/data/test62 b/tests/data/test62
index b8167e5798fec90e383cce56b3a89cd9ad6e6d51..db6627250d930145a94ca919eac331e60340e89d 100644
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -32,7 +32,7 @@ http://%HOSTIP:%HTTPPORT/we/want/62 -b log/jar62.txt -H "Host: www.host.foo.com"
 </command>
 <file name="log/jar62.txt">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .foo.com	TRUE	/we/want/	FALSE	2054030187	test	yes
diff --git a/tests/data/test73 b/tests/data/test73
index 1b47b88bd9707fe9cc69cc75b55613ac23cb852d..dec08010ef2a0702a30bae08465911ef0ce33e5f 100644
--- a/tests/data/test73
+++ b/tests/data/test73
@@ -46,7 +46,7 @@ Host: host.NOT_DISCLOSED.se
 </protocol>
 <file name="log/jar73.txt" mode="text">
 # Netscape HTTP Cookie File
-# http://curlm.haxx.se/rfc/cookie_spec.html
+# http://curl.haxx.se/rfc/cookie_spec.html
 # This file was generated by libcurl! Edit at your own risk.
 
 .NOT_DISCLOSED.se	TRUE	/	FALSE	0	IPCZQX01af0fca5c	000010008168c200d25dfc4b