diff --git a/README.md b/README.md
index 2d87dbe3af0..ab7ae92c16a 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ PRs are automatically picked up by GitHub CI, which runs the builds, integration
# Documentation
The latest version of the Netatalk manual can be found at:
-https://netatalk.sourceforge.io/2.2/htmldocs/
+https://netatalk.io/2.3/htmldocs/
Each Netatalk component also has a *NIX man page which can be accessed on the command line, f.e. `man afpd`.
@@ -59,4 +59,4 @@ https://sourceforge.net/p/netatalk/mailman/
# Website
The Netatalk website is where new releases and other news about the project are posted.
-https://netatalk.sourceforge.io
+https://netatalk.io
diff --git a/distrib/initscripts/a2boot.service.tmpl b/distrib/initscripts/a2boot.service.tmpl
index e781775c727..781db9f8038 100644
--- a/distrib/initscripts/a2boot.service.tmpl
+++ b/distrib/initscripts/a2boot.service.tmpl
@@ -3,7 +3,7 @@
[Unit]
Description=Apple II boot daemon
Documentation=man:a2boot(8)
-Documentation=https://netatalk.sourceforge.io/
+Documentation=https://netatalk.io/
After=network-online.target atalkd.service
Requires=atalkd.service
diff --git a/distrib/initscripts/afpd.service.tmpl b/distrib/initscripts/afpd.service.tmpl
index 8d3744a4d23..906b67dbb03 100644
--- a/distrib/initscripts/afpd.service.tmpl
+++ b/distrib/initscripts/afpd.service.tmpl
@@ -3,7 +3,7 @@
[Unit]
Description=Netatalk AFP fileserver for Macintosh clients
Documentation=man:afpd(8) man:afpd.conf(5) man:AppleVolumes.default(5) man:afp_signature.conf(5) man:afp_voluuid.conf(5) man:afp_ldap.conf(5)
-Documentation=https://netatalk.sourceforge.io/
+Documentation=https://netatalk.io/
After=network-online.target slpd.service avahi-daemon.service cnid.service atalkd.service
Requires=cnid.service
diff --git a/distrib/initscripts/atalkd.service.tmpl b/distrib/initscripts/atalkd.service.tmpl
index b7c20aed402..fe17da03811 100644
--- a/distrib/initscripts/atalkd.service.tmpl
+++ b/distrib/initscripts/atalkd.service.tmpl
@@ -3,7 +3,7 @@
[Unit]
Description=Netatalk AppleTalk daemon
Documentation=man:atalkd(8) man:atalkd.conf(5) man:nbp(1)
-Documentation=https://netatalk.sourceforge.io/
+Documentation=https://netatalk.io/
After=network-online.target
[Service]
diff --git a/distrib/initscripts/cnid.service.tmpl b/distrib/initscripts/cnid.service.tmpl
index 99544415515..b4391620caf 100644
--- a/distrib/initscripts/cnid.service.tmpl
+++ b/distrib/initscripts/cnid.service.tmpl
@@ -3,7 +3,7 @@
[Unit]
Description=Netatalk CNID database daemon for AFP fileserver
Documentation=man:cnid_dbd(8) man:cnid_metad(8) man:dbd(1)
-Documentation=https://netatalk.sourceforge.io/
+Documentation=https://netatalk.io/
After=network-online.target
Before=afpd.service
Requires=afpd.service
diff --git a/distrib/initscripts/papd.service.tmpl b/distrib/initscripts/papd.service.tmpl
index e9e14a99c67..75ffc0b1c7e 100644
--- a/distrib/initscripts/papd.service.tmpl
+++ b/distrib/initscripts/papd.service.tmpl
@@ -3,7 +3,7 @@
[Unit]
Description=AppleTalk PAP printer server daemon
Documentation=man:papd(8) man:papd.conf(5)
-Documentation=https://netatalk.sourceforge.io/
+Documentation=https://netatalk.io/
After=network-online.target atalkd.service
Requires=atalkd.service
diff --git a/distrib/initscripts/timelord.service.tmpl b/distrib/initscripts/timelord.service.tmpl
index a4e167d7934..b4dd100d65b 100644
--- a/distrib/initscripts/timelord.service.tmpl
+++ b/distrib/initscripts/timelord.service.tmpl
@@ -3,7 +3,7 @@
[Unit]
Description=AppleTalk Timelord time server daemon
Documentation=man:timelord(8)
-Documentation=https://netatalk.sourceforge.io/
+Documentation=https://netatalk.io/
After=network-online.target atalkd.service
Requires=atalkd.service
diff --git a/doc/manual/install.xml b/doc/manual/install.xml
index 3f34dd9e8a4..4d93070c70f 100644
--- a/doc/manual/install.xml
+++ b/doc/manual/install.xml
@@ -137,7 +137,7 @@ remote: Counting objects: 2503, done.
For futher information refer to the Developer Notes
+ url="https://netatalk.io/docs/Developer-Notes">Developer Notes
wiki page.
@@ -154,8 +154,8 @@ remote: Counting objects: 2503, done.
available for your OS distribution of choice.
Please see the
- Netatalk wiki for OS specific installation guides.
+ url="https://netatalk.io/docs/">
+ Netatalk wiki docs for OS specific installation guides.