diff --git a/README.rst b/README.rst
index 3724dd2b..75abe145 100644
--- a/README.rst
+++ b/README.rst
@@ -65,7 +65,7 @@ settings for most popular `Embedded Boards <http://platformio.org/#!/boards>`_.
 * Ready for **Cloud Compiling** and **Continuous Integration**
 * Pre-built tool chains, frameworks for the popular `Hardware Platforms <http://platformio.org/#!/platforms>`_
 
-.. image:: https://raw.githubusercontent.com/ivankravets/platformio-web/develop/app/images/platformio-embedded-development.png
+.. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-embedded-development.png
     :target: http://platformio.org
     :alt:  PlatformIO Embedded Development Process
 
@@ -76,13 +76,13 @@ platforms which allows you to organize and have up-to-date external libraries.
 
 * Friendly `Command-Line Interface <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
 * Modern `Web 2.0 Library Search <http://platformio.org/#!/lib>`_
-* Open Source `Library Registry API <https://github.com/ivankravets/platformio-api>`_
+* Open Source `Library Registry API <https://github.com/platformio/platformio-api>`_
 * Library Crawler based on `library.json <http://docs.platformio.org/en/latest/librarymanager/config.html>`_
   specification
 * Library **dependency management**
 * Automatic library updating
 
-.. image:: https://raw.githubusercontent.com/ivankravets/platformio-web/develop/app/images/platformio-library-manager.png
+.. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-library-manager.png
     :target: http://platformio.org
     :alt:  PlatformIO Library Manager Architecture
 
@@ -98,7 +98,7 @@ cross-platform substitute for the classic *Make* utility.
 * Ability to share *built files in a cache*
 * Lookup for external libraries which are installed via `Library Manager <http://docs.platformio.org/en/latest/librarymanager/index.html>`_
 
-.. image:: https://raw.githubusercontent.com/ivankravets/platformio-web/develop/app/images/platformio-scons-builder.png
+.. image:: https://raw.githubusercontent.com/platformio/platformio-web/develop/app/images/platformio-scons-builder.png
     :target: http://platformio.org
     :alt:  PlatformIO Code Builder Architecture
 
diff --git a/docs/index.rst b/docs/index.rst
index bacf22f1..a93d0c27 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -6,7 +6,7 @@ PlatformIO: A cross-platform code builder and the missing library manager
 
 `Website + Library Search <http://platformio.org>`_ |
 `Project Examples <https://github.com/platformio/platformio/tree/develop/examples>`_ |
-`Source Code <https://github.com/ivankravets/platformio>`_ |
+`Source Code <https://github.com/platformio/platformio>`_ |
 `Issues <https://github.com/platformio/platformio/issues>`_ |
 `Blog <http://www.ikravets.com/category/computer-life/platformio>`_ |
 `Twitter <https://twitter.com/PlatformIO_Org>`_
diff --git a/docs/librarymanager/creating.rst b/docs/librarymanager/creating.rst
index b72d8e70..1db24f56 100644
--- a/docs/librarymanager/creating.rst
+++ b/docs/librarymanager/creating.rst
@@ -15,7 +15,7 @@ Source Code Location
 --------------------
 
 There are a several ways how to share your library with the whole world
-(see `examples <https://github.com/ivankravets/platformio-libmirror/tree/master/configs>`_).
+(see `examples <https://github.com/platformio/platformio-libmirror/tree/master/configs>`_).
 
 You can hold a lot of libraries (split into separated folders) inside one of
 the repository/archive. In this case please use :ref:`libjson_include`
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index 1a430a15..4a8da390 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -115,7 +115,7 @@ def after_upgrade(ctx):
     )
     click.echo("- %s us a star on GitHub > %s" % (
         click.style("give", fg="cyan"),
-        click.style("https://github.com/ivankravets/platformio", fg="cyan")
+        click.style("https://github.com/platformio/platformio", fg="cyan")
     ))
     click.secho("Thanks a lot!\n", fg="green")