diff --git a/AUTHORS b/AUTHORS
index 8c4a70e8..e02a1197 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,7 +9,7 @@ contribution, but you are missing in the list, please let us know via
 github issues [2].
 
 [1] https://github.com/tatsuhiro-t/spdylay
-[2] https://github.com/tatsuhiro-t/nghttp2/issues
+[2] https://github.com/nghttp2/nghttp2/issues
 
 --------
 
diff --git a/Dockerfile.android b/Dockerfile.android
index ffd6dbc9..3ea4cf3d 100644
--- a/Dockerfile.android
+++ b/Dockerfile.android
@@ -106,7 +106,7 @@ RUN HOST=arm-linux-androideabi \
     make install
 
 WORKDIR /root/build
-RUN git clone https://github.com/tatsuhiro-t/nghttp2
+RUN git clone https://github.com/nghttp2/nghttp2
 WORKDIR /root/build/nghttp2
 RUN autoreconf -i && \
     ./configure \
diff --git a/doc/sources/h2load-howto.rst b/doc/sources/h2load-howto.rst
index 602c7ea2..c89dcfe7 100644
--- a/doc/sources/h2load-howto.rst
+++ b/doc/sources/h2load-howto.rst
@@ -13,10 +13,10 @@ Compiling from source
 
 h2load is compiled alongside nghttp2 and requires that the
 ``--enable-apps`` flag is passed to ``./configure`` and `required
-dependencies <https://github.com/tatsuhiro-t/nghttp2#requirements>`_
-are available during compilation. For details on compiling, see
-`nghttp2: Building from Git
-<https://github.com/tatsuhiro-t/nghttp2#building-from-git>`_.
+dependencies <https://github.com/nghttp2/nghttp2#requirements>`_ are
+available during compilation. For details on compiling, see `nghttp2:
+Building from Git
+<https://github.com/nghttp2/nghttp2#building-from-git>`_.
 
 Basic Usage
 -----------
diff --git a/doc/sources/index.rst b/doc/sources/index.rst
index 0f848110..e3205dae 100644
--- a/doc/sources/index.rst
+++ b/doc/sources/index.rst
@@ -8,7 +8,8 @@ nghttp2 - HTTP/2 C Library
 
 This is an implementation of Hypertext Transfer Protocol version 2.
 
-The project is hosted at `github.com/tatsuhiro-t/nghttp2 <https://github.com/tatsuhiro-t/nghttp2>`_.
+The project is hosted at `github.com/nghttp2/nghttp2
+<https://github.com/nghttp2/nghttp2>`_.
 
 Contents:
 
@@ -36,14 +37,14 @@ Contents:
    asio_http2_server.h
    asio_http2_client.h
    asio_http2.h
-   Source <https://github.com/tatsuhiro-t/nghttp2>
-   Issues <https://github.com/tatsuhiro-t/nghttp2/issues>
+   Source <https://github.com/nghttp2/nghttp2>
+   Issues <https://github.com/nghttp2/nghttp2/issues>
    nghttp2.org <https://nghttp2.org/>
 
 Released Versions
 =================
 
-https://github.com/tatsuhiro-t/nghttp2/releases
+https://github.com/nghttp2/nghttp2/releases
 
 Resources
 ---------