diff --git a/README.md b/README.md
index a7db324ea..39598bbea 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # esp-hal
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/jessebraham/esp-hal/CI?label=CI&logo=github&style=flat-square)
+![GitHub Workflow Status](https://img.shields.io/github/workflow/status/esp-rs/esp-hal/CI?label=CI&logo=github&style=flat-square)
 ![MIT/Apache-2.0 licensed](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue?style=flat-square)
 [![Matrix](https://img.shields.io/matrix/esp-rs:matrix.org?label=join%20matrix&color=BEC5C9&logo=matrix&style=flat-square)](https://matrix.to/#/#esp-rs:matrix.org)
 
diff --git a/esp-hal-common/src/lib.rs b/esp-hal-common/src/lib.rs
index 0ce1a65f6..1f892ca2f 100644
--- a/esp-hal-common/src/lib.rs
+++ b/esp-hal-common/src/lib.rs
@@ -11,10 +11,10 @@
 //! - [esp32s3-hal]
 //!
 //! [embedded-hal]: https://docs.rs/embedded-hal/latest/embedded_hal/
-//! [esp32-hal]: https://github.com/jessebraham/esp-hal/tree/main/esp32-hal
-//! [esp32c3-hal]: https://github.com/jessebraham/esp-hal/tree/main/esp32c3-hal
-//! [esp32s2-hal]: https://github.com/jessebraham/esp-hal/tree/main/esp32s2-hal
-//! [esp32s3-hal]: https://github.com/jessebraham/esp-hal/tree/main/esp32s3-hal
+//! [esp32-hal]: https://github.com/esp-rs/esp-hal/tree/main/esp32-hal
+//! [esp32c3-hal]: https://github.com/esp-rs/esp-hal/tree/main/esp32c3-hal
+//! [esp32s2-hal]: https://github.com/esp-rs/esp-hal/tree/main/esp32s2-hal
+//! [esp32s3-hal]: https://github.com/esp-rs/esp-hal/tree/main/esp32s3-hal
 
 #![no_std]
 
diff --git a/esp32-hal/Cargo.toml b/esp32-hal/Cargo.toml
index 6379d2e4f..a6dec0d03 100644
--- a/esp32-hal/Cargo.toml
+++ b/esp32-hal/Cargo.toml
@@ -29,17 +29,12 @@ embedded-hal = { version = "0.2", features = ["unproven"] }
 nb           = "1.0"
 void         = { version = "1.0", default-features = false }
 xtensa-lx    = { version = "0.4", features = ["lx6"] }
+xtensa-lx-rt = { version = "0.7", features = ["lx6"], optional = true }
 
 [dependencies.esp-hal-common]
 path     = "../esp-hal-common"
 features = ["esp32"]
 
-[dependencies.xtensa-lx-rt]
-git      = "https://github.com/esp-rs/xtensa-lx-rt/"
-branch   = "unify-xtensa-asm"
-features = ["lx6"]
-optional = true
-
 [dev-dependencies]
 panic-halt = "0.2"