diff --git a/build-source.sh b/build-source.sh
index b7bd700a..add57583 100755
--- a/build-source.sh
+++ b/build-source.sh
@@ -36,7 +36,7 @@ fi
 mkdir -p build/source
 mkdir -p dist
 cd build/source
-git clone https://github.com/micahflee/onionshare.git
+git clone https://github.com/onionshare/onionshare.git
 cd onionshare
 
 # Verify tag
diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
index 38062d43..f9c7177e 100644
--- a/cli/onionshare_cli/onion.py
+++ b/cli/onionshare_cli/onion.py
@@ -651,7 +651,7 @@ class Onion(object):
                 key_content = "RSA1024"
 
         # v3 onions don't yet support basic auth. Our ticket:
-        # https://github.com/micahflee/onionshare/issues/697
+        # https://github.com/onionshare/onionshare/issues/697
         if (
             key_type == "NEW"
             and key_content == "ED25519-V3"
diff --git a/desktop/README.md b/desktop/README.md
index eb91e315..4a59fe03 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -5,7 +5,7 @@
 Start by getting the source code and changing to the `desktop` folder:
 
 ```sh
-git clone https://github.com/micahflee/onionshare.git
+git clone https://github.com/onionshare/onionshare.git
 cd onionshare/desktop
 ```
 
diff --git a/desktop/src/onionshare/tab/mode/__init__.py b/desktop/src/onionshare/tab/mode/__init__.py
index 683c2e73..aeecaf66 100644
--- a/desktop/src/onionshare/tab/mode/__init__.py
+++ b/desktop/src/onionshare/tab/mode/__init__.py
@@ -363,7 +363,7 @@ class Mode(QtWidgets.QWidget):
             self.startup_thread.quit()
 
         # Canceling only works in Windows
-        # https://github.com/micahflee/onionshare/issues/1371
+        # https://github.com/onionshare/onionshare/issues/1371
         if self.common.platform == "Windows":
             if self.onion_thread:
                 self.common.log("Mode", "cancel_server: quitting onion thread")
diff --git a/desktop/src/org.onionshare.OnionShare.appdata.xml b/desktop/src/org.onionshare.OnionShare.appdata.xml
index 9e401472..a53bc930 100644
--- a/desktop/src/org.onionshare.OnionShare.appdata.xml
+++ b/desktop/src/org.onionshare.OnionShare.appdata.xml
@@ -17,7 +17,7 @@
             <caption>Types of services that OnionShare supports</caption>
         </screenshot>
     </screenshots>
-    <url type="bugtracker">https://github.com/micahflee/onionshare/issues/</url>
+    <url type="bugtracker">https://github.com/onionshare/onionshare/issues/</url>
     <url type="help">https://onionshare.org/</url>
     <url type="homepage">https://onionshare.org/</url>
     <developer_name>Micah Lee</developer_name>
diff --git a/docs/source/develop.rst b/docs/source/develop.rst
index 6ac1da61..6e429e6a 100644
--- a/docs/source/develop.rst
+++ b/docs/source/develop.rst
@@ -14,10 +14,10 @@ OnionShare also has a `mailing list <https://lists.riseup.net/www/subscribe/onio
 Contributing Code
 -----------------
 
-OnionShare source code is to be found in this Git repository: https://github.com/micahflee/onionshare
+OnionShare source code is to be found in this Git repository: https://github.com/onionshare/onionshare
 
 If you'd like to contribute code to OnionShare, it helps to join the Keybase team and ask questions about what you're thinking of working on.
-You should also review all of the `open issues <https://github.com/micahflee/onionshare/issues>`_ on GitHub to see if there are any you'd like to tackle.
+You should also review all of the `open issues <https://github.com/onionshare/onionshare/issues>`_ on GitHub to see if there are any you'd like to tackle.
 
 When you're ready to contribute code, open a pull request in the GitHub repository and one of the project maintainers will review it and possibly ask questions, request changes, reject it, or merge it into the project.
 
@@ -27,7 +27,7 @@ Starting Development
 --------------------
 
 OnionShare is developed in Python.
-To get started, clone the Git repository at https://github.com/micahflee/onionshare/ and then consult the ``cli/README.md`` file to learn how to set up your development environment for the command-line version, and the ``desktop/README.md`` file to learn how to set up your development environment for the graphical version.
+To get started, clone the Git repository at https://github.com/onionshare/onionshare/ and then consult the ``cli/README.md`` file to learn how to set up your development environment for the command-line version, and the ``desktop/README.md`` file to learn how to set up your development environment for the graphical version.
 
 Those files contain the necessary technical instructions and commands install dependencies for your platform, and to run OnionShare from the source tree.
 
diff --git a/docs/source/help.rst b/docs/source/help.rst
index 8c04350a..ad7b76cd 100644
--- a/docs/source/help.rst
+++ b/docs/source/help.rst
@@ -9,12 +9,12 @@ You will find instructions on how to use OnionShare. Look through all of the sec
 Check the GitHub Issues
 -----------------------
 
-If it isn't on the website, please check the `GitHub issues <https://github.com/micahflee/onionshare/issues>`_. It's possible someone else has encountered the same problem and either raised it with the developers, or maybe even posted a solution.
+If it isn't on the website, please check the `GitHub issues <https://github.com/onionshare/onionshare/issues>`_. It's possible someone else has encountered the same problem and either raised it with the developers, or maybe even posted a solution.
 
 Submit an Issue Yourself
 ------------------------
 
-If you are unable to find a solution, or wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/micahflee/onionshare/issues/new>`_. This requires `creating a GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_.
+If you are unable to find a solution, or wish to ask a question or suggest a new feature, please `submit an issue <https://github.com/onionshare/onionshare/issues/new>`_. This requires `creating a GitHub account <https://help.github.com/articles/signing-up-for-a-new-github-account/>`_.
 
 Join our Keybase Team
 ---------------------