diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c13b487dd..24f871fdd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -105,7 +105,7 @@ the list of authors in the about box.
 
 ## Building
 
-[See the documentation](https://github.com/syncthing/syncthing/wiki/Building)
+[See the documentation](http://docs.syncthing.net/dev/building.html)
 on how to get started with a build environment.
 
 ## Branches
@@ -133,7 +133,7 @@ Yes please!
 
 ## Documentation
 
-[Over here!](https://github.com/syncthing/syncthing/wiki)
+[Over here!](http://docs.syncthing.net/)
 
 ## License
 
diff --git a/check-contrib.sh b/check-contrib.sh
index 21b8d1e64..9715857ed 100755
--- a/check-contrib.sh
+++ b/check-contrib.sh
@@ -19,7 +19,8 @@ no-docs-typos() {
 	grep -v 4b76ec40c07078beaa2c5e250ed7d9bd6276a718 |\
 	grep -v ffc39dfbcb34eacc3ea12327a02b6e7741a2c207 |\
 	grep -v 32a76901a91ff0f663db6f0830e0aedec946e4d0 |\
-	grep -v af3288043a49bcc28f8ae3060852a09de552fe5f
+	grep -v af3288043a49bcc28f8ae3060852a09de552fe5f |\
+	grep -v 3626003f680bad3e63677982576d3a05421e88e9
 }
 
 print-missing-authors() {
diff --git a/etc/linux-systemd/README.md b/etc/linux-systemd/README.md
index 7d7bc25ba..f3fad92cf 100644
--- a/etc/linux-systemd/README.md
+++ b/etc/linux-systemd/README.md
@@ -5,4 +5,4 @@ This directory contains configuration files for running syncthing under the
 systemd user service. For further documentation take a look at the [systemd
 section][1] on the Github Wiki.
 
-[1]: https://github.com/syncthing/syncthing/wiki/Autostart-syncthing#systemd
+[1]: http://docs.syncthing.net/users/autostart.html?highlight=systemd 
diff --git a/etc/linux-systemd/system/syncthing@.service b/etc/linux-systemd/system/syncthing@.service
index f5ecf1972..abd0a5122 100644
--- a/etc/linux-systemd/system/syncthing@.service
+++ b/etc/linux-systemd/system/syncthing@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Syncthing - Open Source Continuous File Synchronization for %I
-Documentation=https://github.com/syncthing/syncthing/wiki
+Documentation=http://docs.syncthing.net/
 After=network.target
 
 [Service]
diff --git a/etc/linux-systemd/user/syncthing.service b/etc/linux-systemd/user/syncthing.service
index eedbed22b..8e39d10ab 100644
--- a/etc/linux-systemd/user/syncthing.service
+++ b/etc/linux-systemd/user/syncthing.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Syncthing - Open Source Continuous File Synchronization
-Documentation=https://github.com/syncthing/syncthing/wiki
+Documentation=http://docs.syncthing.net/
 After=network.target
 
 [Service]
diff --git a/gui/index.html b/gui/index.html
index bbb12f906..eb5f87a2c 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -783,7 +783,7 @@
 
           <hr/>
 
-          <p class="small"><span translate>Quick guide to supported patterns</span> (<a href="https://github.com/syncthing/syncthing/wiki/Ignoring-Files" target="_blank" translate>full documentation</a>):</p>
+          <p class="small"><span translate>Quick guide to supported patterns</span> (<a href="http://docs.syncthing.net/users/ignoring.html" target="_blank" translate>full documentation</a>):</p>
           <dl class="dl-horizontal dl-narrow small">
             <dt><code>!</code></dt> <dd><span translate>Inversion of the given condition (i.e. do not exclude)</span></dd>
             <dt><code>*</code></dt> <dd><span translate>Single level wildcard (matches within a directory only)</span></dd>