diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b34e84bad..90c6915d38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -551,50 +551,50 @@ architecture.
 
 - Initial release
 
-[Unreleased]: https://github.com/japaric/heapless/compare/v0.7.16...HEAD
-[v0.7.16]: https://github.com/japaric/heapless/compare/v0.7.15...v0.7.16
-[v0.7.15]: https://github.com/japaric/heapless/compare/v0.7.14...v0.7.15
-[v0.7.14]: https://github.com/japaric/heapless/compare/v0.7.13...v0.7.14
-[v0.7.13]: https://github.com/japaric/heapless/compare/v0.7.12...v0.7.13
-[v0.7.12]: https://github.com/japaric/heapless/compare/v0.7.11...v0.7.12
-[v0.7.11]: https://github.com/japaric/heapless/compare/v0.7.10...v0.7.11
-[v0.7.10]: https://github.com/japaric/heapless/compare/v0.7.9...v0.7.10
-[v0.7.9]: https://github.com/japaric/heapless/compare/v0.7.8...v0.7.9
-[v0.7.8]: https://github.com/japaric/heapless/compare/v0.7.7...v0.7.8
-[v0.7.7]: https://github.com/japaric/heapless/compare/v0.7.6...v0.7.7
-[v0.7.6]: https://github.com/japaric/heapless/compare/v0.7.5...v0.7.6
-[v0.7.5]: https://github.com/japaric/heapless/compare/v0.7.4...v0.7.5
-[v0.7.4]: https://github.com/japaric/heapless/compare/v0.7.3...v0.7.4
-[v0.7.3]: https://github.com/japaric/heapless/compare/v0.7.2...v0.7.3
-[v0.7.2]: https://github.com/japaric/heapless/compare/v0.7.1...v0.7.2
-[v0.7.1]: https://github.com/japaric/heapless/compare/v0.7.0...v0.7.1
-[v0.7.0]: https://github.com/japaric/heapless/compare/v0.6.1...v0.7.0
-[v0.6.1]: https://github.com/japaric/heapless/compare/v0.6.0...v0.6.1
-[v0.6.0]: https://github.com/japaric/heapless/compare/v0.5.5...v0.6.0
-[v0.5.5]: https://github.com/japaric/heapless/compare/v0.5.4...v0.5.5
-[v0.5.4]: https://github.com/japaric/heapless/compare/v0.5.3...v0.5.4
-[v0.5.3]: https://github.com/japaric/heapless/compare/v0.5.2...v0.5.3
-[v0.5.2]: https://github.com/japaric/heapless/compare/v0.5.1...v0.5.2
-[v0.5.1]: https://github.com/japaric/heapless/compare/v0.5.0...v0.5.1
-[v0.5.0]: https://github.com/japaric/heapless/compare/v0.4.4...v0.5.0
-[v0.4.4]: https://github.com/japaric/heapless/compare/v0.4.3...v0.4.4
-[v0.4.3]: https://github.com/japaric/heapless/compare/v0.4.2...v0.4.3
-[v0.4.2]: https://github.com/japaric/heapless/compare/v0.4.1...v0.4.2
-[v0.4.1]: https://github.com/japaric/heapless/compare/v0.4.0...v0.4.1
-[v0.4.0]: https://github.com/japaric/heapless/compare/v0.3.7...v0.4.0
-[v0.3.7]: https://github.com/japaric/heapless/compare/v0.3.6...v0.3.7
-[v0.3.6]: https://github.com/japaric/heapless/compare/v0.3.5...v0.3.6
-[v0.3.5]: https://github.com/japaric/heapless/compare/v0.3.4...v0.3.5
-[v0.3.4]: https://github.com/japaric/heapless/compare/v0.3.3...v0.3.4
-[v0.3.3]: https://github.com/japaric/heapless/compare/v0.3.2...v0.3.3
-[v0.3.2]: https://github.com/japaric/heapless/compare/v0.3.1...v0.3.2
-[v0.3.1]: https://github.com/japaric/heapless/compare/v0.3.0...v0.3.1
-[v0.3.0]: https://github.com/japaric/heapless/compare/v0.2.7...v0.3.0
-[v0.2.7]: https://github.com/japaric/heapless/compare/v0.2.6...v0.2.7
-[v0.2.6]: https://github.com/japaric/heapless/compare/v0.2.5...v0.2.6
-[v0.2.5]: https://github.com/japaric/heapless/compare/v0.2.4...v0.2.5
-[v0.2.4]: https://github.com/japaric/heapless/compare/v0.2.3...v0.2.4
-[v0.2.3]: https://github.com/japaric/heapless/compare/v0.2.2...v0.2.3
-[v0.2.2]: https://github.com/japaric/heapless/compare/v0.2.1...v0.2.2
-[v0.2.1]: https://github.com/japaric/heapless/compare/v0.2.0...v0.2.1
-[v0.2.0]: https://github.com/japaric/heapless/compare/v0.1.0...v0.2.0
+[Unreleased]: https://github.com/rust-embedded/heapless/compare/v0.7.16...HEAD
+[v0.7.16]: https://github.com/rust-embedded/heapless/compare/v0.7.15...v0.7.16
+[v0.7.15]: https://github.com/rust-embedded/heapless/compare/v0.7.14...v0.7.15
+[v0.7.14]: https://github.com/rust-embedded/heapless/compare/v0.7.13...v0.7.14
+[v0.7.13]: https://github.com/rust-embedded/heapless/compare/v0.7.12...v0.7.13
+[v0.7.12]: https://github.com/rust-embedded/heapless/compare/v0.7.11...v0.7.12
+[v0.7.11]: https://github.com/rust-embedded/heapless/compare/v0.7.10...v0.7.11
+[v0.7.10]: https://github.com/rust-embedded/heapless/compare/v0.7.9...v0.7.10
+[v0.7.9]: https://github.com/rust-embedded/heapless/compare/v0.7.8...v0.7.9
+[v0.7.8]: https://github.com/rust-embedded/heapless/compare/v0.7.7...v0.7.8
+[v0.7.7]: https://github.com/rust-embedded/heapless/compare/v0.7.6...v0.7.7
+[v0.7.6]: https://github.com/rust-embedded/heapless/compare/v0.7.5...v0.7.6
+[v0.7.5]: https://github.com/rust-embedded/heapless/compare/v0.7.4...v0.7.5
+[v0.7.4]: https://github.com/rust-embedded/heapless/compare/v0.7.3...v0.7.4
+[v0.7.3]: https://github.com/rust-embedded/heapless/compare/v0.7.2...v0.7.3
+[v0.7.2]: https://github.com/rust-embedded/heapless/compare/v0.7.1...v0.7.2
+[v0.7.1]: https://github.com/rust-embedded/heapless/compare/v0.7.0...v0.7.1
+[v0.7.0]: https://github.com/rust-embedded/heapless/compare/v0.6.1...v0.7.0
+[v0.6.1]: https://github.com/rust-embedded/heapless/compare/v0.6.0...v0.6.1
+[v0.6.0]: https://github.com/rust-embedded/heapless/compare/v0.5.5...v0.6.0
+[v0.5.5]: https://github.com/rust-embedded/heapless/compare/v0.5.4...v0.5.5
+[v0.5.4]: https://github.com/rust-embedded/heapless/compare/v0.5.3...v0.5.4
+[v0.5.3]: https://github.com/rust-embedded/heapless/compare/v0.5.2...v0.5.3
+[v0.5.2]: https://github.com/rust-embedded/heapless/compare/v0.5.1...v0.5.2
+[v0.5.1]: https://github.com/rust-embedded/heapless/compare/v0.5.0...v0.5.1
+[v0.5.0]: https://github.com/rust-embedded/heapless/compare/v0.4.4...v0.5.0
+[v0.4.4]: https://github.com/rust-embedded/heapless/compare/v0.4.3...v0.4.4
+[v0.4.3]: https://github.com/rust-embedded/heapless/compare/v0.4.2...v0.4.3
+[v0.4.2]: https://github.com/rust-embedded/heapless/compare/v0.4.1...v0.4.2
+[v0.4.1]: https://github.com/rust-embedded/heapless/compare/v0.4.0...v0.4.1
+[v0.4.0]: https://github.com/rust-embedded/heapless/compare/v0.3.7...v0.4.0
+[v0.3.7]: https://github.com/rust-embedded/heapless/compare/v0.3.6...v0.3.7
+[v0.3.6]: https://github.com/rust-embedded/heapless/compare/v0.3.5...v0.3.6
+[v0.3.5]: https://github.com/rust-embedded/heapless/compare/v0.3.4...v0.3.5
+[v0.3.4]: https://github.com/rust-embedded/heapless/compare/v0.3.3...v0.3.4
+[v0.3.3]: https://github.com/rust-embedded/heapless/compare/v0.3.2...v0.3.3
+[v0.3.2]: https://github.com/rust-embedded/heapless/compare/v0.3.1...v0.3.2
+[v0.3.1]: https://github.com/rust-embedded/heapless/compare/v0.3.0...v0.3.1
+[v0.3.0]: https://github.com/rust-embedded/heapless/compare/v0.2.7...v0.3.0
+[v0.2.7]: https://github.com/rust-embedded/heapless/compare/v0.2.6...v0.2.7
+[v0.2.6]: https://github.com/rust-embedded/heapless/compare/v0.2.5...v0.2.6
+[v0.2.5]: https://github.com/rust-embedded/heapless/compare/v0.2.4...v0.2.5
+[v0.2.4]: https://github.com/rust-embedded/heapless/compare/v0.2.3...v0.2.4
+[v0.2.3]: https://github.com/rust-embedded/heapless/compare/v0.2.2...v0.2.3
+[v0.2.2]: https://github.com/rust-embedded/heapless/compare/v0.2.1...v0.2.2
+[v0.2.1]: https://github.com/rust-embedded/heapless/compare/v0.2.0...v0.2.1
+[v0.2.0]: https://github.com/rust-embedded/heapless/compare/v0.1.0...v0.2.0
diff --git a/Cargo.toml b/Cargo.toml
index 292bc35175..44ae4b831b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 keywords = ["static", "no-heap"]
 license = "MIT OR Apache-2.0"
 name = "heapless"
-repository = "https://github.com/japaric/heapless"
+repository = "https://github.com/rust-embedded/heapless"
 version = "0.8.0"
 
 [features]