diff --git a/README.md b/README.md
index 8d612360..e4f6707f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ![InfiniTime logo](doc/logo/infinitime-logo-small.jpg "InfiniTime Logo")
 
-Fast open-source firmware for the [PineTime smartwatch](https://www.pine64.org/pinetime/) with many features, written in modern C++.
+Fast open-source firmware for the [PineTime smartwatch](https://pine64.org/devices/pinetime/) with many features, written in modern C++.
 
 ## New to InfiniTime?
 
diff --git a/bootloader/ota-dfu-python/README.md b/bootloader/ota-dfu-python/README.md
index c38e597a..c18da8bb 100644
--- a/bootloader/ota-dfu-python/README.md
+++ b/bootloader/ota-dfu-python/README.md
@@ -7,9 +7,9 @@ My own contribution is little more than a brute force conversion to
 python3. It is sparsely tested so there are likely to be a few
 remaining bytes versus string bugs remaining in the places I didn't test
 . I used it primarily as part of
-[wasp-os](https://github.com/daniel-thompson/wasp-os) as a way to
+[wasp-os](https://github.com/wasp-os/wasp-os) as a way to
 deliver OTA updates to nRF52-based smart watches, especially the
-[Pine64 PineTime](https://www.pine64.org/pinetime/).
+[Pine64 PineTime](https://pine64.org/devices/pinetime/).
 
 ## What does it do?
 
diff --git a/src/drivers/Hrs3300.cpp b/src/drivers/Hrs3300.cpp
index 7dfd301c..33889b6f 100644
--- a/src/drivers/Hrs3300.cpp
+++ b/src/drivers/Hrs3300.cpp
@@ -19,7 +19,7 @@ namespace {
 }
 
 /** Driver for the HRS3300 heart rate sensor.
- * Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/drivers/hrs3300.py
+ * Original implementation from wasp-os : https://github.com/wasp-os/wasp-os/blob/master/wasp/drivers/hrs3300.py
  *
  * Experimentaly derived changes to improve signal/noise (see comments below) - Ceimour
  */