diff --git a/docs/source/firmware_development_setup.rst b/docs/source/firmware_development_setup.rst
index daf27a09..436c89f0 100644
--- a/docs/source/firmware_development_setup.rst
+++ b/docs/source/firmware_development_setup.rst
@@ -4,4 +4,4 @@ Firmware Development Setup
 
 Firmware build instructions are included in the repository under firmware/README:
 
-`https://github.com/mossmann/hackrf/blob/master/firmware/README <https://github.com/mossmann/hackrf/blob/master/firmware/README>`__
+`https://github.com/greatscottgadgets/hackrf/blob/master/firmware/README <https://github.com/greatscottgadgets/hackrf/blob/master/firmware/README>`__
diff --git a/docs/source/installing_hackrf_software.rst b/docs/source/installing_hackrf_software.rst
index dc4cc181..fd029acc 100644
--- a/docs/source/installing_hackrf_software.rst
+++ b/docs/source/installing_hackrf_software.rst
@@ -76,7 +76,7 @@ Installing From Source
 Linux / OS X / \*BSD: Building HackRF Software From Source
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-Acquire the source for the HackRF tools from either a `release archive <https://github.com/mossmann/hackrf/releases>`__ or git: ``git clone https://github.com/mossmann/hackrf.git``
+Acquire the source for the HackRF tools from either a `release archive <https://github.com/greatscottgadgets/hackrf/releases>`__ or git: ``git clone https://github.com/greatscottgadgets/hackrf.git``
 
 Once you have the source downloaded, the host tools can be built as follows:
 
diff --git a/docs/source/updating_firmware.rst b/docs/source/updating_firmware.rst
index 39d2b2d7..f8e7fbb9 100644
--- a/docs/source/updating_firmware.rst
+++ b/docs/source/updating_firmware.rst
@@ -19,7 +19,7 @@ To update the firmware on a working HackRF One, use the hackrf_spiflash program:
 
 	hackrf_spiflash -w hackrf_one_usb.bin
 
-You can find the firmware binary (hackrf_one_usb.bin) in the firmware-bin directory of the latest `release package <https://github.com/mossmann/hackrf/releases/latest>`__ or you can compile your own from the `source <https://github.com/mossmann/hackrf/tree/master/firmware>`__. For Jawbreaker, use hackrf_jawbreaker_usb.bin. If you compile from source, the file will be called hackrf_usb.bin.
+You can find the firmware binary (hackrf_one_usb.bin) in the firmware-bin directory of the latest `release package <https://github.com/greatscottgadgets/hackrf/releases/latest>`__ or you can compile your own from the `source <https://github.com/greatscottgadgets/hackrf/tree/master/firmware>`__. For Jawbreaker, use hackrf_jawbreaker_usb.bin. If you compile from source, the file will be called hackrf_usb.bin.
 
 The hackrf_spiflash program is part of hackrf-tools.