diff --git a/README.md b/README.md
index b040f651c..ae6ad10e0 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Resources
 
 [:globe_with_meridians: Website](https://swift-project.org/)
 
-[:green_book: User guide](https://docs.swift-project.org/)
+[:green_book: User guide](https://swift-project.org/documentation/)
 
 [:wave: Discord](https://discord.gg/R7Atd9A)
 
@@ -46,6 +46,6 @@ _swift_ is written in modern C++17 using the Qt framework.
 
 Pull requests should be made against the `main` branch.
 
-[:blue_book: Developer guide](https://docs.swift-project.org/doku.php?id=developer_documentation)
+[:blue_book: Developer guide](https://github.com/swift-project/pilotclient/wiki)
 
 [:orange_book: API documentation](https://apidocs.swift-project.org/)
diff --git a/docs/src/mainpage.dox b/docs/src/mainpage.dox
index b47e0505c..2c404f7dc 100644
--- a/docs/src/mainpage.dox
+++ b/docs/src/mainpage.dox
@@ -13,9 +13,9 @@ The application allows users of flight simulation software to connect to online
 
 \section links Links
 
-- <a href="http://www.swift-project.org/">swift website</a>
-- <a href="http://docs.swift-project.org/">user guide</a>
-- <a href="https://docs.swift-project.org/doku.php?id=developer_documentation">developer guide</a>
+- <a href="https://swift-project.org/">swift website</a>
+- <a href="https://swift-project.org/documentation/">user guide</a>
+- <a href="https://github.com/swift-project/pilotclient/wiki">developer guide</a>
 - <a href="https://github.com/swift-project/pilotclient">github repository</a>
 
 */
diff --git a/resources/share/legal/about.html b/resources/share/legal/about.html
index 2b78b3ff8..40b1563b9 100644
--- a/resources/share/legal/about.html
+++ b/resources/share/legal/about.html
@@ -28,25 +28,24 @@
 			<td>
 				Download swift:
 				<ul>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=installation_and_configuration#system_requirements">System requirements</a>
+					<li><a target="_blank" href="https://swift-project.org/home/system_requirements/">System requirements</a>
 					<li><a target="_blank" href="https://github.com/swift-project/pilotclient/releases/latest"><i>swift</i> pilot client</a></li>
 					<li><a target="_blank" href="https://github.com/swift-project/pilotclient/releases">Tester and developer versions</a></li>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=download_aircraft_models">Aircraft models (external)</a></li>
 				</ul>
 			</td>
 			<td>
 				Installation:
 				<ul>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=installation_and_configuration"><i>swift</i> installation</a></li>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=installing_new_version_parallel_copy_swift_data_other_versions"><i><i>swift</i></i> update</a></li>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=checklist_check_before_1st_flight">Before 1st flight</a></li>
+					<li><a target="_blank" href="https://swift-project.org/home/install/"><i>swift</i> installation</a></li>
+					<li><a target="_blank" href="https://swift-project.org/home/updating/"><i><i>swift</i></i> update</a></li>
+					<li><a target="_blank" href="https://swift-project.org/home/checklist_first_flight/">Before 1st flight</a></li>
 				</ul>
 			</td>
 			<td>
 				Documentation:
 				<ul>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=user_manual"><i>swift</i> help</a></li>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=tutorials"><i>swift</i> @YouTube</a></li>
+					<li><a target="_blank" href="https://swift-project.org/documentation/"><i>swift</i> help</a></li>
+					<li><a target="_blank" href="https://swift-project.org/home/video_tutorials/"><i>swift</i> @YouTube</a></li>
 					<li><a target="_blank" href="http://swift-project.org/blog/"><i>swift</i> Blog</a></li>
 				</ul>
 			</td>
@@ -57,13 +56,13 @@
 				<ul>
 					<li><a target="_blank" href="https://forums.vatsim.net/forum/347-swift/">VATSIM forum (VATSIM members)</a></li>
                                         <li><a target="_blank" href="https://discord.gg/R7Atd9A">Discord channels</a></li>
-					<li><a target="_blank" target="_blank"href="https://docs.swift-project.org/doku.php?id=reporting_bugs">Reporting bugs</a></li>
+					<li><a target="_blank" target="_blank"href="https://swift-project.org/home/getting_involved/bug_reporting/">Reporting bugs</a></li>
 				</ul>
 			</td>
 			<td>
 				<i>swift</i> testers:
 				<ul>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=getting_involved">Getting involved</a></li>
+					<li><a target="_blank" href="https://swift-project.org/home/getting_involved/">Getting involved</a></li>
 					<li><a target="_blank" href="https://datastore.swift-project.org"><i>swift</i> model database</a></li>
 				</ul>
 			</td>
@@ -71,7 +70,7 @@
 				<i>swift</i> developers:
 				<ul>
 					<li><a target="_blank" href="https://github.com/swift-project"><i>swift</i> developer site</a></li>
-					<li><a target="_blank" href="https://docs.swift-project.org/doku.php?id=getting_started_developer">Start as developer</a></li>
+					<li><a target="_blank" href="https://swift-project.org/home/getting_involved/developer/">Start as developer</a></li>
 				</ul>
 			</td>
 		</tr>
diff --git a/resources/share/legal/data.html b/resources/share/legal/data.html
index e0a8a453e..16e130ec1 100644
--- a/resources/share/legal/data.html
+++ b/resources/share/legal/data.html
@@ -52,7 +52,7 @@
 			<td>
 			In the swift clients you can enable to send crash reports, which will also send technical
 			information such as your IP and hardware info.
-			<a href="https://docs.swift-project.org/doku.php?id=crash_reports_enable_dumps/">Further details are here.</a>
+			<a href="https://swift-project.org/troubleshooting/crash_reports/">Further details are here.</a>
 			</td>
 			<td>
 			Helps us to improve the quality of swift.
@@ -172,7 +172,7 @@
 			<td>
 			Im swift client kann man crash reports erlauben, bei diesen werden technische Informationen
 			wie Ihre IP Adresse oder Hardware Informationen gesendet.
-			<a href="https://docs.swift-project.org/doku.php?id=crash_reports_enable_dumps">Weitere Informationen.</a>
+			<a href="https://swift-project.org/troubleshooting/crash_reports/">Weitere Informationen.</a>
 			</td>
 			<td>
 			Hilft uns swift zu verbessern.