diff --git a/doc/install.md b/doc/install.md
index dd82528..b0a8332 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -5,7 +5,7 @@
 
 ## Simple installation
 
-* Download the binary from the [releases](https://github.com/minetest-tools/mapserver/releases) for your architecture and platform
+* Download the binary from the [releases](https://github.com/minetest-mapserver/mapserver/releases) for your architecture and platform
 * Drop the binary into your world folder (the one with the `world.mt` and `map.sqlite` files)
 * Start the mapserver via command-line: `./mapserver` or `./mapserver.exe`
 * Point your browser to `http://127.0.0.1:8080`
diff --git a/doc/mod.md b/doc/mod.md
index 5b8b06d..299518a 100644
--- a/doc/mod.md
+++ b/doc/mod.md
@@ -1,7 +1,7 @@
 
 # Mapserver mod
 
-* Repository: https://github.com/minetest-tools/mapserver_mod
+* Repository: https://github.com/minetest-mapserver/mapserver_mod
 
 If the `mapserver-mod` is installed and configured
 you get more realtime-data from within your minetest-world:
@@ -15,7 +15,7 @@ You can use the `mapserver-mod` either passive or active:
 
 ## Installing and configuring the bridge-mod
 
-Download or clone from https://github.com/minetest-tools/mapserver_mod
+Download or clone from https://github.com/minetest-mapserver/mapserver_mod
 
 If you want to enable craftable mapobjects (poi, labels, trainblocks, etc) you
 can enable the setting in your `minetest.conf` (defaults to false)
diff --git a/readme.md b/readme.md
index ba2b6aa..975049e 100644
--- a/readme.md
+++ b/readme.md
@@ -6,8 +6,8 @@ Minetest mapserver
 ![](https://github.com/minetest-mapserver/mapserver/workflows/go-test/badge.svg)
 
 ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/minetest-mapserver/mapserver)
-![GitHub repo size](https://img.shields.io/github/repo-size/minetest-tools/mapserver.svg)
-![GitHub closed issues](https://img.shields.io/github/issues-closed/minetest-tools/mapserver.svg)
+![GitHub repo size](https://img.shields.io/github/repo-size/minetest-mapserver/mapserver.svg)
+![GitHub closed issues](https://img.shields.io/github/issues-closed/minetest-mapserver/mapserver.svg)
 ![GitHub issues](https://img.shields.io/github/issues/minetest-mapserver/mapserver)
 
 ![GitHub All Releases](https://img.shields.io/github/downloads/minetest-mapserver/mapserver/total)