diff --git a/README.md b/README.md
index 297c61df8..1058b4c6a 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ any location, while feeling as close to a real desktop application as possible.
 * https://github.com/supahgreg/tt-rss is a fork of tt-rss as of 2025-10-03, created by one of its long-time contributors (`wn_`/`wn_name` on `tt-rss.org`, `supahgreg` on `github.com`).
   * For now, just treat this as a slightly-tweaked mirror of the original project (initially just removing `tt-rss.org` references and integrations + getting things working).
   * Due to use of `invalid@email.com` on my pre-2025-10-03 commits GitHub incorrectly shows `ivanivanov884` (the GitHub user associated with that e-mail address) as the committer.  Oops. `¯\_(ツ)_/¯`
-* Plugins that were under https://gitlab.tt-rss.org/tt-rss/plugins have been mirrored to `https://github.com/supahgreg/tt-rss-plugin-*` (NOTE: names have changed)
-* The repository that held the content for https://tt-rss.org has been mirrored to https://github.com/supahgreg/tt-rss-web-static.
+* Plugins that were under https://gitlab.tt-rss.org/tt-rss/plugins have been mirrored to `https://github.com/supahgreg/tt-rss-plugin-*` (NOTE: repo names have changed to get a consistent `tt-rss-plugin-*` prefix).
+* Documentation from https://tt-rss.org has recreated in https://github.com/supahgreg/tt-rss/wiki .
+  * If needed, the repository that held the content for https://tt-rss.org has been mirrored to https://github.com/supahgreg/tt-rss-web-static .  Some content tweaks were made after mirroring and prior to the wiki being set up.
 * Docker images are being published to Docker Hub-- see https://hub.docker.com/r/supahgreg/tt-rss/tags and https://hub.docker.com/r/supahgreg/tt-rss-web-nginx/tags .
 
 ## License
diff --git a/classes/Config.php b/classes/Config.php
index 61aab85ca..31d8467d7 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -632,9 +632,9 @@ class Config {
 
 						<?php foreach ($errors as $error) { echo self::format_error($error); } ?>
 
-						<p>You might want to check the tt-rss <a target="_blank" href="https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/InstallationNotes.md">wiki</a> or
-							<a target="_blank" href="https://github.com/supahgreg/tt-rss/discussions">discussions</a> for more information. Please search before creating a new topic
-							for your question.</p>
+						<p>You might want to check the tt-rss <a target="_blank" href="https://github.com/supahgreg/tt-rss/wiki/Installation-Notes">wiki</a> or
+							<a target="_blank" href="https://github.com/supahgreg/tt-rss/discussions">discussions</a> for more information.
+							Please search before creating a new topic for your question.</p>
 					</div>
 				</body>
 			</html>
diff --git a/classes/Pref_Prefs.php b/classes/Pref_Prefs.php
index c50e61016..4d80ac9b7 100644
--- a/classes/Pref_Prefs.php
+++ b/classes/Pref_Prefs.php
@@ -647,7 +647,7 @@ class Pref_Prefs extends Handler_Protected {
 						<?= \Controls\button_tag(\Controls\icon("palette") . " " . __("Customize"), "",
 								["onclick" => "Helpers.Prefs.customizeCSS()"]) ?>
 						<?= \Controls\button_tag(\Controls\icon("open_in_new") . " " . __("More themes..."), "",
-								["class" => "alt-info", "onclick" => "window.open(\"https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/Themes.md\")"]) ?>
+								["class" => "alt-info", "onclick" => "window.open(\"https://github.com/supahgreg/tt-rss/wiki/Themes\")"]) ?>
 
 						<?php
 
@@ -713,7 +713,7 @@ class Pref_Prefs extends Handler_Protected {
 
 						print \Controls\button_tag(\Controls\icon("help") . " " . __("More info..."), "", [
 							"class" => "alt-info",
-							"onclick" => "window.open('https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/SSL%20Certificate%20Authentication.md')"]);
+							"onclick" => "window.open('https://github.com/supahgreg/tt-rss/wiki/SSL-Certificate-Authentication')"]);
 
 					} else if ($pref_name == Prefs::DIGEST_PREFERRED_TIME) {
 						print "<input dojoType=\"dijit.form.ValidationTextBox\"
@@ -878,7 +878,7 @@ class Pref_Prefs extends Handler_Protected {
 							print_error(
 								T_sprintf("The following plugins use per-feed content hooks. This may cause excessive data usage and origin server load resulting in a ban of your instance: <b>%s</b>" ,
 									implode(", ", array_map(fn($plugin) => get_class($plugin), $feed_handlers))
-								) . " (<a href='https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/FeedHandlerPlugins.md' target='_blank'>".__("More info...")."</a>)"
+								) . " (<a href='https://github.com/supahgreg/tt-rss/wiki/Feed-Handler-Plugins' target='_blank'>".__("More info...")."</a>)"
 							);
 						}
 					?> -->
@@ -890,7 +890,7 @@ class Pref_Prefs extends Handler_Protected {
 				</div>
 				<div dojoType="dijit.layout.ContentPane" region="bottom">
 
-					<button dojoType='dijit.form.Button' class="alt-info pull-right" onclick='window.open("https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/Plugins.md")'>
+					<button dojoType='dijit.form.Button' class="alt-info pull-right" onclick='window.open("https://github.com/supahgreg/tt-rss/wiki/Plugins")'>
 						<i class='material-icons'>help</i>
 						<?= __("More info") ?>
 					</button>
diff --git a/config.php-dist b/config.php-dist
index eed4a7572..6e193c1f5 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -13,6 +13,6 @@
 
 		etc.
 
-		See this page for more information: https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/GlobalConfig.md
+		See this page for more information: https://github.com/supahgreg/tt-rss/wiki/Global-Config
 	*/
 
diff --git a/include/functions.php b/include/functions.php
index 190c840f2..4178151e0 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -329,7 +329,7 @@
 	}
 
 	/** Convert values accepted by tt-rss as true/false to PHP booleans
-	 * @see https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/ApiReference.md#boolean-values
+	 * @see https://github.com/supahgreg/tt-rss/wiki/API-Reference#boolean-values
 	 * @param null|string $s null values are considered false
 	 */
 	function sql_bool_to_bool(?string $s): bool {
diff --git a/js/CommonDialogs.js b/js/CommonDialogs.js
index 6f8767c09..1b62cb99e 100644
--- a/js/CommonDialogs.js
+++ b/js/CommonDialogs.js
@@ -690,7 +690,7 @@ const	CommonDialogs = {
 							</section>
 							<footer>
 								<button dojoType='dijit.form.Button' style='float : left' class='alt-info'
-									onclick='window.open("https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/GeneratedFeeds.md")'>
+									onclick='window.open("https://github.com/supahgreg/tt-rss/wiki/Generated-Feeds")'>
 									<i class='material-icons'>help</i> ${__("More info...")}</button>
 								<button dojoType='dijit.form.Button' onclick="return App.dialogOf(this).regenFeedKey('${feed}', '${is_cat}')">
 									${App.FormFields.icon("refresh")}
diff --git a/js/CommonFilters.js b/js/CommonFilters.js
index c3dc108e7..e94eb9314 100644
--- a/js/CommonFilters.js
+++ b/js/CommonFilters.js
@@ -226,7 +226,7 @@ const	Filters = {
 
 								<footer>
 									${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("More info"), "", {class: 'pull-left alt-info',
-										onclick: "window.open('https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/ContentFilters.md')"})}
+										onclick: "window.open('https://github.com/supahgreg/tt-rss/wiki/Content-Filters')"})}
 									${App.FormFields.submit_tag(App.FormFields.icon("save") + " " + __("Save"), {onclick: "App.dialogOf(this).execute()"})}
 									${App.FormFields.cancel_dialog_tag(__("Cancel"))}
 								</footer>
diff --git a/js/Feeds.js b/js/Feeds.js
index 52477f021..49de183b5 100644
--- a/js/Feeds.js
+++ b/js/Feeds.js
@@ -658,7 +658,7 @@ const	Feeds = {
 										<footer>
 											${reply.show_syntax_help ?
 												`${App.FormFields.button_tag(App.FormFields.icon("help") + " " + __("Search syntax"), "",
-													{class: 'alt-info pull-left', onclick: "window.open('https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/SearchSyntax.md')"})}
+													{class: 'alt-info pull-left', onclick: "window.open('https://github.com/supahgreg/tt-rss/wiki/Search-Syntax')"})}
 													` : ''}
 
 											${App.FormFields.submit_tag(App.FormFields.icon("search") + " " + __('Search'), {onclick: "App.dialogOf(this).execute()"})}
diff --git a/plugins/bookmarklets/init.php b/plugins/bookmarklets/init.php
index 889fa55be..fbf13e653 100644
--- a/plugins/bookmarklets/init.php
+++ b/plugins/bookmarklets/init.php
@@ -9,7 +9,7 @@ class Bookmarklets extends Plugin {
 			"Easy feed subscription and web page sharing using bookmarklets",
 			"fox",
 			false,
-			"https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/ShareAnything.md");
+			"https://github.com/supahgreg/tt-rss/wiki/Share-Anything");
   }
 
 	function init($host) {
@@ -371,7 +371,7 @@ class Bookmarklets extends Plugin {
 			</label>
 
 			<?= \Controls\button_tag(\Controls\icon("help") . " " . __("More info..."), "",
-									["class" => 'alt-info', "onclick" => "window.open('https://github.com/supahgreg/tt-rss-web-static/blob/main/docs/wiki/ShareAnything.md')"]) ?>
+									["class" => 'alt-info', "onclick" => "window.open('https://github.com/supahgreg/tt-rss/wiki/Share-Anything')"]) ?>
 
 		</div>