diff --git a/.cirrus/Dockerfile.ubuntu20.04 b/.cirrus/Dockerfile.ubuntu20.04
index 0cb94fcf..74371214 100644
--- a/.cirrus/Dockerfile.ubuntu20.04
+++ b/.cirrus/Dockerfile.ubuntu20.04
@@ -57,7 +57,7 @@ RUN set -e -x ;\
     curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y ;\
     mkdir -p /usr/local/src ;\
     cd /usr/local/src ;\
-    git clone --recursive https://github.com/daveshah1/prjoxide.git ;\
+    git clone --recursive https://github.com/gatecat/prjoxide.git ;\
     cd prjoxide ;\
     git reset --hard a73e1629f2ec6618e492047577912d8d50115708 ;\
     cd libprjoxide ;\
diff --git a/README.md b/README.md
index 97d4c62f..99bbd54c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ tool.
 Currently nextpnr supports:
  * Lattice iCE40 devices supported by [Project IceStorm](http://www.clifford.at/icestorm/)
  * Lattice ECP5 devices supported by [Project Trellis](https://github.com/YosysHQ/prjtrellis)
- * Lattice Nexus devices supported by [Project Oxide](https://github.com/daveshah1/prjoxide)
+ * Lattice Nexus devices supported by [Project Oxide](https://github.com/gatecat/prjoxide)
  * Gowin LittleBee devices supported by [Project Apicula](https://github.com/YosysHQ/apicula)
  * *(experimental)* a "generic" back-end for user-defined architectures
 
@@ -103,7 +103,7 @@ sudo make install
 
 ### nextpnr-nexus
 
-For Nexus support, install [Project Oxide](https://github.com/daveshah1/prjoxide) to `$HOME/.cargo` or another location, which should be passed as `-DOXIDE_INSTALL_PREFIX=$HOME/.cargo` to CMake. Then build and install `nextpnr-nexus` using the following commands:
+For Nexus support, install [Project Oxide](https://github.com/gatecat/prjoxide) to `$HOME/.cargo` or another location, which should be passed as `-DOXIDE_INSTALL_PREFIX=$HOME/.cargo` to CMake. Then build and install `nextpnr-nexus` using the following commands:
 
 ```
 cmake . -DARCH=nexus -DOXIDE_INSTALL_PREFIX=$HOME/.cargo
@@ -111,7 +111,7 @@ make -j$(nproc)
 sudo make install
 ```
 
- - Examples of the Nexus flow for a range of boards can be found in the [Project Oxide Examples](https://github.com/daveshah1/prjoxide/tree/master/examples).
+ - Examples of the Nexus flow for a range of boards can be found in the [Project Oxide Examples](https://github.com/gatecat/prjoxide/tree/master/examples).
 
 Nexus support is currently experimental, and has only been tested with engineering sample silicon.