diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index e1b4afe8b..8bbfd6a9b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,4 +2,4 @@
 - [ ] Added an entry to `CHANGELOG.md` if knowledge of this change could be valuable to users
 - [ ] Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
 - [ ] Created an example program if it would help users understand this functionality
-- [ ] Updated [feature matrix](https://github.com/tomaka/winit/blob/master/FEATURES.md), if new features were added or implemented
+- [ ] Updated [feature matrix](https://github.com/rust-windowing/winit/blob/master/FEATURES.md), if new features were added or implemented
diff --git a/.gitmodules b/.gitmodules
index c885e6c14..9656dc788 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "deps/apk-builder"]
 	path = deps/apk-builder
-	url = https://github.com/tomaka/android-rs-glue
+	url = https://github.com/rust-windowing/android-rs-glue
diff --git a/Cargo.toml b/Cargo.toml
index 35fde6d68..4f86eb6aa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ description = "Cross-platform window creation library."
 keywords = ["windowing"]
 license = "Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/tomaka/winit"
+repository = "https://github.com/rust-windowing/winit"
 documentation = "https://docs.rs/winit"
 categories = ["gui"]
 
diff --git a/FEATURES.md b/FEATURES.md
index 515ff5979..60be7fd9a 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -192,18 +192,18 @@ Changes in the API that have been agreed upon but aren't implemented across all
 |Feature                             |Windows|MacOS |Linux x11|Linux Wayland|Android|iOS    |Emscripten|
 |------------------------------      | ----- | ---- | ------- | ----------- | ----- | ----- | -------- |
 
-[#165]: https://github.com/tomaka/winit/issues/165
-[#219]: https://github.com/tomaka/winit/issues/219
-[#242]: https://github.com/tomaka/winit/issues/242
-[#306]: https://github.com/tomaka/winit/issues/306
-[#315]: https://github.com/tomaka/winit/issues/315
-[#319]: https://github.com/tomaka/winit/issues/319
-[#33]: https://github.com/tomaka/winit/issues/33
-[#459]: https://github.com/tomaka/winit/issues/459
-[#5]: https://github.com/tomaka/winit/issues/5
-[#63]: https://github.com/tomaka/winit/issues/63
-[#720]: https://github.com/tomaka/winit/issues/720
-[#721]: https://github.com/tomaka/winit/issues/721
-[#750]: https://github.com/tomaka/winit/issues/750
-[#804]: https://github.com/tomaka/winit/issues/804
-[#812]: https://github.com/tomaka/winit/issues/812
+[#165]: https://github.com/rust-windowing/winit/issues/165
+[#219]: https://github.com/rust-windowing/winit/issues/219
+[#242]: https://github.com/rust-windowing/winit/issues/242
+[#306]: https://github.com/rust-windowing/winit/issues/306
+[#315]: https://github.com/rust-windowing/winit/issues/315
+[#319]: https://github.com/rust-windowing/winit/issues/319
+[#33]: https://github.com/rust-windowing/winit/issues/33
+[#459]: https://github.com/rust-windowing/winit/issues/459
+[#5]: https://github.com/rust-windowing/winit/issues/5
+[#63]: https://github.com/rust-windowing/winit/issues/63
+[#720]: https://github.com/rust-windowing/winit/issues/720
+[#721]: https://github.com/rust-windowing/winit/issues/721
+[#750]: https://github.com/rust-windowing/winit/issues/750
+[#804]: https://github.com/rust-windowing/winit/issues/804
+[#812]: https://github.com/rust-windowing/winit/issues/812