diff --git a/README.md b/README.md
index 5256c8671..20e8a5198 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ A short overview of the process is provided below.
 
 This repository is aimed at Debian based distributions (Ubuntu, Pop!_OS, elementary OS, ...).
 Releases are provided for both, Debian and Arch Linux based distributions, but if you're running Arch, you may want to consider looking at [this][arch-linux-surface] project instead, or [here][fedora-linux-surface] if you're running Fedora.
-These releases can be found here: https://github.com/qzed/linux-surface/releases.
+These releases can be found here: https://github.com/linux-surface/linux-surface/releases.
 
 You may also want to consider setting up one of the [package repositories][wiki-repos] to obtain automatic updates.
 After the installation, you should have a look at the [post-installation notes][wiki-setup-post], specifically you may want to set up [secure-boot][wiki-secure-boot] and install the proprietary firmware package (usually named `linux-firmware`) if you have not done so already.
@@ -78,7 +78,7 @@ If you're running something else, you may need to adapt them for your distributi
 2. Clone this repository.
    To save some time, you can use the `--depth 1` flag.
    ```
-   git clone --depth 1 https://github.com/qzed/linux-surface.git
+   git clone --depth 1 https://github.com/linux-surface/linux-surface.git
    ```
    If you want to update this git repository later on, e.g. for re-running the `setup.sh` script, you can simply run `git pull` inside the repository.
 
@@ -114,23 +114,19 @@ If you want to compile the kernel yourself (e.g. if your distribution is not sup
 
 ### Support
 
-If you have an issue, please have a look at [jakeday/linux-surface][jakeday-issues] and create a new issue if it is not already being discussed.
-If you have an issue that is directly related to the kernel patches (and not configuration- or setup-related), you can also open an issue at [qzed/linux-surface-kernel][linux-surface-kernel].
 If you have questions or need support, please use our [Gitter Community][gitter]!
-
 For development related questions and discussions, please consider joining our IRC channel on freenode (`freenode/##linux-surface`).
 
-[wiki-setup]: https://github.com/qzed/linux-surface/wiki/Installation-and-Setup
-[wiki-setup-post]: https://github.com/qzed/linux-surface/wiki/Installation-and-Setup#post-installation
-[wiki-repos]: https://github.com/qzed/linux-surface/wiki/Package-Repositories
-[wiki-secure-boot]: https://github.com/qzed/linux-surface/wiki/Secure-Boot
-[wiki-compiling]: https://github.com/qzed/linux-surface/wiki/Installation-and-Setup#compiling-the-kernel-from-source
+[wiki-setup]: https://github.com/linux-surface/linux-surface/wiki/Installation-and-Setup
+[wiki-setup-post]: https://github.com/linux-surface/linux-surface/wiki/Installation-and-Setup#post-installation
+[wiki-repos]: https://github.com/linux-surface/linux-surface/wiki/Package-Repositories
+[wiki-secure-boot]: https://github.com/linux-surface/linux-surface/wiki/Secure-Boot
+[wiki-compiling]: https://github.com/linux-surface/linux-surface/wiki/Installation-and-Setup#compiling-the-kernel-from-source
 
 [arch-linux-surface]: https://github.com/dmhacker/arch-linux-surface
 [fedora-linux-surface]: https://github.com/StollD/fedora-linux-surface/
 
 [gitter]: https://gitter.im/linux-surface
-[hibernate-setup]: https://github.com/qzed/linux-surface/wiki/Secure-Boot
+[hibernate-setup]: https://github.com/linux-surface/linux-surface/wiki/Secure-Boot
 
-[jakeday-issues]: https://github.com/jakeday/linux-surface/issues
-[linux-surface-kernel]: https://github.com/qzed/linux-surface-kernel/
+[linux-surface-kernel]: https://github.com/linux-surface/kernel/
diff --git a/firmware/intel/ipts/README.md b/firmware/intel/ipts/README.md
index 9ad8d6432..7efbeb1df 100644
--- a/firmware/intel/ipts/README.md
+++ b/firmware/intel/ipts/README.md
@@ -23,4 +23,4 @@ The touchscreen contact count descriptor is incorrectly declared as being report
 It is actually reported one time followed by three padding bytes.
 The descriptor has been patched accordingly.
 
-For more details, see https://github.com/qzed/linux-surface-kernel/wiki/IPTS-Firmware#bogus-hid-descriptor-for-surface-laptops-mshw0079.
+For more details, see https://github.com/linux-surface/kernel/wiki/IPTS-Firmware#bogus-hid-descriptor-for-surface-laptops-mshw0079.
diff --git a/setup.sh b/setup.sh
index 6be2e077c..6409c40f3 100755
--- a/setup.sh
+++ b/setup.sh
@@ -68,7 +68,7 @@ read -rp "Do you want to install the patched libwacom packages? (type yes or no)
 if [ "$uselibwacom" = "yes" ]; then
     echo "==> Downloading latest libwacom-surface..."
 
-    urls=$(curl --silent "https://api.github.com/repos/qzed/libwacom-surface-deb/releases/latest" \
+    urls=$(curl --silent "https://api.github.com/repos/linux-surface/libwacom-surface-deb/releases/latest" \
            | tr ',' '\n' \
            | grep '"browser_download_url":' \
            | sed -E 's/.*"([^"]+)".*/\1/' \
@@ -147,7 +147,7 @@ Do you want this script to download and install the latest kernel for you?
 if [ "$autoinstallkernel" = "yes" ]; then
     echo "==> Downloading latest kernel..."
 
-    urls=$(curl --silent "https://api.github.com/repos/qzed/linux-surface/releases/latest" \
+    urls=$(curl --silent "https://api.github.com/repos/linux-surface/linux-surface/releases/latest" \
            | tr ',' '\n' \
            | grep '"browser_download_url":' \
            | sed -E 's/.*"([^"]+)".*/\1/' \