diff --git a/Dockerfile.mingw b/Dockerfile.mingw
index 2fbf6562..a0186316 100644
--- a/Dockerfile.mingw
+++ b/Dockerfile.mingw
@@ -105,6 +105,6 @@ RUN cd libssh2-1.6.0 && \
     LIBS="-lws2_32" && \
     make install
 
-RUN git clone https://github.com/tatsuhiro-t/aria2
+RUN git clone https://github.com/aria2/aria2
 RUN cd aria2 && autoreconf -i && ./mingw-config && make && \
     $HOST-strip src/aria2c.exe
diff --git a/Dockerfile.raspberrypi b/Dockerfile.raspberrypi
index b6da64dc..dc499746 100644
--- a/Dockerfile.raspberrypi
+++ b/Dockerfile.raspberrypi
@@ -80,7 +80,7 @@ RUN mkdir sqlite && cd sqlite && \
     make -s install
 
 RUN mkdir aria && cd aria && \
-    curl -s 'https://api.github.com/repos/tatsuhiro-t/aria2/releases/latest' | \
+    curl -s 'https://api.github.com/repos/aria2/aria2/releases/latest' | \
         grep 'browser_download_url.*[0-9]\.tar\.bz2' | sed -e 's/^[[:space:]]*//' | \
         cut -d ' ' -f 2 | xargs -I % curl -Ls -o - '%' | tar xjf - --strip-components=1 && \
     ./configure \
diff --git a/README.rst b/README.rst
index 2ca1f173..a2505d10 100644
--- a/README.rst
+++ b/README.rst
@@ -98,11 +98,11 @@ How to get source code
 ----------------------
 
 We maintain the source code at Github:
-https://github.com/tatsuhiro-t/aria2
+https://github.com/aria2/aria2
 
 To get the latest source code, run following command::
 
-    $ git clone https://github.com/tatsuhiro-t/aria2.git
+    $ git clone https://github.com/aria2/aria2.git
 
 This will create aria2 directory in your current directory and source
 files are stored there.
diff --git a/configure.ac b/configure.ac
index c16090bd..fe1164cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ([2.67])
-AC_INIT([aria2],[1.22.0],[https://github.com/tatsuhiro-t/aria2/issues],[aria2],[https://aria2.github.io/])
+AC_INIT([aria2],[1.22.0],[https://github.com/aria2/aria2/issues],[aria2],[https://aria2.github.io/])
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
diff --git a/doc/manual-src/pt/README.rst b/doc/manual-src/pt/README.rst
index fe2deb96..c31a4d5f 100644
--- a/doc/manual-src/pt/README.rst
+++ b/doc/manual-src/pt/README.rst
@@ -102,11 +102,11 @@ Como obter o código fonte
 -------------------------
 
 O código fonte é mantido no Github:
-https://github.com/tatsuhiro-t/aria2
+https://github.com/aria2/aria2
 
 Para obter o último código fonte, execute o seguinte comando::
 
-    $ git clone git://github.com/tatsuhiro-t/aria2.git
+    $ git clone git://github.com/aria2/aria2.git
 
 Aria2 será criado no diretório corrente do seu computador com os arquivos fonte.
 
diff --git a/src/AppleTLSSession.cc b/src/AppleTLSSession.cc
index 6b001c86..2361a0be 100644
--- a/src/AppleTLSSession.cc
+++ b/src/AppleTLSSession.cc
@@ -553,7 +553,7 @@ int AppleTLSSession::closeConnection()
 
 int AppleTLSSession::checkDirection()
 {
-  // See: https://github.com/tatsuhiro-t/aria2/pull/61#issuecomment-16051793
+  // See: https://github.com/aria2/aria2/pull/61#issuecomment-16051793
   if (state_ == st_connected) {
     // Need to check read first, as SocketCore kinda expects this
     size_t buffered;