diff --git a/README b/README
index 5e32e0e7f4fe326c5234e73d77b1607ec7da227b..f0b3b93932f608e1597fe4435ffbe7fded765a2c 100644
--- a/README
+++ b/README
@@ -38,7 +38,7 @@ GIT
 
   To download the very latest source off the GIT server do this:
 
-    git clone https://github.com/bagder/curl.git
+    git clone https://github.com/curl/curl.git
 
   (you'll get a directory named curl created, filled with the source code)
 
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6eeda9fbd66f75860df32c35e9bd6fc532d9b6b1..a92facc2bda79668dc7a9245498965db9b587704 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -30,6 +30,6 @@ advice from friends like these:
 
 References to bug reports and discussions on issues:
 
- [1] = https://github.com/bagder/curl/pull/616
+ [1] = https://github.com/curl/curl/pull/616
  [2] = https://curl.haxx.se/bug/?i=617
  [3] = https://curl.haxx.se/bug/?i=624
diff --git a/docs/BUGS b/docs/BUGS
index 2838c258d6adda571ac5f89f67662392c648fb90..dfd9b205ae3b85ca76989c02c6fa538a39b51df3 100644
--- a/docs/BUGS
+++ b/docs/BUGS
@@ -35,7 +35,7 @@ BUGS
   have a go at a solution. You can optionally also post your bug/problem at
   curl's bug tracking system over at
 
-        https://github.com/bagder/curl/issues
+        https://github.com/curl/curl/issues
 
   Please read the rest of this document below first before doing that!
 
diff --git a/docs/CONTRIBUTE b/docs/CONTRIBUTE
index 02244e68619b4101520b373ea3b874383463b287..9e74d468a684c8958b7ecaa0fbc5126d85ca6328 100644
--- a/docs/CONTRIBUTE
+++ b/docs/CONTRIBUTE
@@ -203,7 +203,7 @@
 
  You need to first checkout the repository:
 
-     git clone https://github.com/bagder/curl.git
+     git clone https://github.com/curl/curl.git
 
  You then proceed and edit all the files you like and you commit them to your
  local repository:
diff --git a/docs/FAQ b/docs/FAQ
index 039f6bc80e542d418bda0f30cc9d3720da4ca5ca..334dbf3f1b1f470160adca91bbb5c08567b4b782 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -226,7 +226,7 @@ FAQ
   considerable time already on maintaining and developing curl. In order to
   get more out of us, you should consider trading in some of your time and
   efforts in return. Simply go to the GitHub repo which resides at
-  https://github.com/bagder/curl, fork the project, and create pull requests
+  https://github.com/curl/curl, fork the project, and create pull requests
   with your proposed changes.
 
   If you write the code, chances are bigger that it will get into curl faster.
@@ -254,7 +254,7 @@ FAQ
   We still get help from companies. Haxx provides web site, bandwidth, mailing
   lists etc, sourceforge.net hosts project services we take advantage from,
   like the bug tracker, and GitHub hosts the primary git repository at
-  https://github.com/bagder/curl. Also again, some companies have sponsored
+  https://github.com/curl/curl. Also again, some companies have sponsored
   certain parts of the development in the past and I hope some will continue to
   do so in the future.
 
diff --git a/docs/KNOWN_BUGS b/docs/KNOWN_BUGS
index c23e15e7a789bfdf557ec4d9e249bdf661008394..6dde0fdc29f6de2e87af3ab5f282a17fa32ecca4 100644
--- a/docs/KNOWN_BUGS
+++ b/docs/KNOWN_BUGS
@@ -4,7 +4,7 @@ changelog of the current development status, as one or more of these problems
 may have been fixed since this was written!
 
 91. "curl_easy_perform hangs with imap and PolarSSL"
-  https://github.com/bagder/curl/issues/334
+  https://github.com/curl/curl/issues/334
 
 90. IMAP "SEARCH ALL" truncates output on large boxes. "A quick search of the
   code reveals that pingpong.c contains some truncation code, at line 408,
@@ -35,7 +35,7 @@ may have been fixed since this was written!
   CURLINFO_STARTTRANSFER_TIME is wrong. While using POST
   CURLINFO_STARTTRANSFER_TIME minus CURLINFO_PRETRANSFER_TIME is near to zero
   every time.
-  https://github.com/bagder/curl/issues/218
+  https://github.com/curl/curl/issues/218
   https://curl.haxx.se/bug/view.cgi?id=1213
 
 84. CURLINFO_SSL_VERIFYRESULT is only implemented for the OpenSSL and NSS
diff --git a/docs/TODO b/docs/TODO
index 51175345082288a19b1e25fb4ee157628c89c473..e231322282c1a2d2029482158d4523715fdd4708 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -239,7 +239,7 @@
  would be the ones that link to 3rd party libs. That would allow us to avoid
  having to load ALL dependencies since only the necessary ones for this
  app/invoke/used protocols would be necessary to load.  See
- https://github.com/bagder/curl/issues/349
+ https://github.com/curl/curl/issues/349
 
 1.12 have form functions use CURL handle argument
 
@@ -292,7 +292,7 @@
  perhaps URL encoded byte values over 128 etc (basically do what the redirect
  following code already does).
 
- https://github.com/bagder/curl/issues/514
+ https://github.com/curl/curl/issues/514
 
 2. libcurl - multi interface
 
@@ -434,7 +434,7 @@ This is not detailed in any FTP specification.
 
 5.6 Refuse "downgrade" redirects
 
- See https://github.com/bagder/curl/issues/226
+ See https://github.com/curl/curl/issues/226
 
  Consider a way to tell curl to refuse to "downgrade" protocol with a redirect
  and/or possibly a bit that refuses redirect to change protocol completely.
@@ -729,13 +729,13 @@ that doesn't exist on the server, just like --ftp-create-dirs.
  {partURL1:name1,partURL2:name2,partURL3:name3} where the name following the
  colon is the output name.
 
- See https://github.com/bagder/curl/issues/221
+ See https://github.com/curl/curl/issues/221
 
 17.10 improve how curl works in a windows console window
 
  If you pull the scrollbar when transferring with curl in a Windows console
  window, the transfer is interrupted and can get disconnected. This can
- probably be improved. See https://github.com/bagder/curl/issues/322
+ probably be improved. See https://github.com/curl/curl/issues/322
 
 
 18. Build
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 44a9e55110b295c6c1b76bb4be735534761b7082..33ad129193cdb230acaa18c11f319372c0451f45 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -707,7 +707,7 @@ int netware_init(void);
 #endif
 
 /* In Windows the default file mode is text but an application can override it.
-Therefore we specify it explicitly. https://github.com/bagder/curl/pull/258
+Therefore we specify it explicitly. https://github.com/curl/curl/pull/258
 */
 #if defined(WIN32) || defined(MSDOS)
 #define FOPEN_READTEXT "rt"
diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 3874468b056c852b874ffb8ce48957efb4cb99ad..50544aba722145859f66fbeecc51c7dba9418db1 100644
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -11,8 +11,8 @@
 882
 938
 # test 1801 causes problems on Mac OS X and github
-# https://github.com/bagder/curl/issues/380
+# https://github.com/curl/curl/issues/380
 1801
 # test 1510 casues problems on the CI on github
-# example: https://travis-ci.org/bagder/curl/builds/81633600
+# example: https://travis-ci.org/curl/curl/builds/81633600
 1510
diff --git a/tests/testcurl.1 b/tests/testcurl.1
index 958b5f2d8aa62f82bcfc4b9597f53571f4692283..509f5dcc9d7cce1bc6fb5d23ac52b4c0b45de99c 100644
--- a/tests/testcurl.1
+++ b/tests/testcurl.1
@@ -84,7 +84,7 @@ https://curl.haxx.se/auto/autocurl.txt):
 .nf
   $ mkdir daily-curl
   $ cd daily-curl
-  $ git clone git://github.com/bagder/curl.git
+  $ git clone git://github.com/curl/curl.git
 .fi
 
 With the curl sources checked out, or downloaded, you can start testing right