diff --git a/doc/install.md b/doc/install.md
index 8935adb..a7eeda8 100644
--- a/doc/install.md
+++ b/doc/install.md
@@ -3,7 +3,7 @@
 
 **Please make a backup of your world in case something goes wrong**
 
-* Download the binary from the [releases](https://github.com/thomasrudin-mt/mapserver/releases) for your architecture and platform
+* Download the binary from the [releases](https://github.com/minetest-tools/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 6e47865..5b8b06d 100644
--- a/doc/mod.md
+++ b/doc/mod.md
@@ -1,7 +1,7 @@
 
 # Mapserver mod
 
-* Repository: https://github.com/thomasrudin-mt/mapserver_mod
+* Repository: https://github.com/minetest-tools/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/thomasrudin-mt/mapserver_mod
+Download or clone from https://github.com/minetest-tools/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 a6ca7f7..23828cf 100644
--- a/readme.md
+++ b/readme.md
@@ -1,10 +1,10 @@
 Minetest mapserver
 =======
 
-[![Dependencies](https://img.shields.io/librariesio/github/thomasrudin-mt/mapserver.svg)](https://github.com/thomasrudin-mt/mapserver)
-[![Build Status](https://travis-ci.org/thomasrudin-mt/mapserver.svg?branch=master)](https://travis-ci.org/thomasrudin-mt/mapserver)
-![GitHub repo size](https://img.shields.io/github/repo-size/thomasrudin-mt/mapserver.svg)
-![GitHub closed issues](https://img.shields.io/github/issues-closed/thomasrudin-mt/mapserver.svg)
+[![Dependencies](https://img.shields.io/librariesio/github/minetest-tools/mapserver.svg)](https://github.com/minetest-tools/mapserver)
+[![Build Status](https://travis-ci.org/minetest-tools/mapserver.svg?branch=master)](https://travis-ci.org/minetest-tools/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)
 
 Realtime mapserver for [Minetest](https://minetest.net)
 
diff --git a/static/js/map.js b/static/js/map.js
index a672558..882c015 100644
--- a/static/js/map.js
+++ b/static/js/map.js
@@ -19,7 +19,7 @@ export function setup(cfg){
     crs: SimpleCRS
   });
 
-  map.attributionControl.addAttribution('<a href="https://github.com/thomasrudin-mt/mapserver">Minetest Mapserver</a>');
+  map.attributionControl.addAttribution('<a href="https://github.com/minetest-tools/mapserver">Minetest Mapserver</a>');
 
   var overlays = {};