From 21f9f320603d676ec7163906e226c30b1df23d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 19 Apr 2026 10:15:00 +0200
Subject: [PATCH] Update the project's github URL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/eclipse/mosquitto redirects to
https://github.com/eclipse-mosquitto/mosquitto, and this repo references
a mix of the two URLs. Fix it by using the non-redirecting URL
everywhere.

The changes were made with:

  git ls-files | xargs -n1 sed -i -e "s,github.com/eclipse/mosquitto,github.com/eclipse-mosquitto/mosquitto,g"

Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com>
---
 CONTRIBUTING.md                               | 10 ++--
 doc/joss-paper/codemeta.json                  |  2 +-
 test/broker/02-subhier-crash.py               |  2 +-
 test/broker/02-subscribe-long-topic.py        |  2 +-
 test/broker/03-publish-long-topic.py          |  2 +-
 test/broker/05-session-expiry-v5.py           |  2 +-
 test/broker/06-bridge-clean-session-core.py   |  2 +-
 test/broker/07-will-delay-session-expiry-0.py |  2 +-
 test/broker/07-will-delay-session-expiry.py   |  2 +-
 test/broker/07-will-delay-session-expiry2.py  |  2 +-
 test/broker/07-will-reconnect-1273.py         |  2 +-
 test/broker/08-ssl-hup-disconnect.py          |  2 +-
 test/broker/data/REGRESSION.json              |  2 +-
 www/pages/documentation/migrating-to-2-0.md   |  2 +-
 www/pages/index.html                          |  2 +-
 .../2016/03/repository-moved-to-github.md     |  2 +-
 www/posts/2016/06/version-1-4-9-released.md   | 24 ++++----
 www/posts/2016/08/version-1-4-10-released.md  | 18 +++---
 www/posts/2017/02/version-1-4-11-released.md  | 16 +++---
 .../05/security-advisory-cve-2017-7650.md     | 12 ++--
 www/posts/2017/07/version-1-4-13-released.md  | 10 ++--
 ...ty-advisory-cve-2017-7651-cve-2017-7652.md | 22 ++++----
 www/posts/2018/08/version-151-released.md     | 30 +++++-----
 .../09/security-advisory-cve-2018-12543.md    | 10 ++--
 www/posts/2018/09/version-152-released.md     | 12 ++--
 www/posts/2018/11/mqtt5-progress.md           |  2 +-
 www/posts/2018/11/version-154-released.md     | 24 ++++----
 www/posts/2018/12/version-155-released.md     | 24 ++++----
 www/posts/2019/02/version-1-5-6-released.md   | 18 +++---
 www/posts/2019/02/version-1-5-7-released.md   |  6 +-
 www/posts/2019/02/version-1-5-8-released.md   |  8 +--
 www/posts/2019/04/version-1-6-1-released.md   | 10 ++--
 www/posts/2019/04/version-1-6-2-released.md   |  8 +--
 www/posts/2019/04/version-1-6-released.md     |  8 +--
 www/posts/2019/06/version-1-6-3-released.md   | 34 +++++------
 www/posts/2019/08/version-1-6-4-released.md   | 18 +++---
 www/posts/2019/09/version-1-6-5-released.md   | 26 ++++-----
 www/posts/2019/09/version-1-6-6-released.md   |  4 +-
 www/posts/2019/09/version-1-6-7-released.md   | 12 ++--
 www/posts/2019/11/version-1-6-8-released.md   | 34 +++++------
 www/posts/2020/02/version-1-6-9-released.md   | 28 +++++-----
 www/posts/2020/05/version-1-6-10-released.md  | 22 ++++----
 www/posts/2020/08/version-1-6-11-released.md  | 38 ++++++-------
 www/posts/2020/08/version-1-6-12-released.md  |  4 +-
 www/posts/2020/12/version-2-0-0-released.md   | 56 +++++++++----------
 www/posts/2020/12/version-2-0-2-released.md   |  8 +--
 www/posts/2020/12/version-2-0-3-released.md   | 18 +++---
 www/posts/2020/12/version-2-0-4-released.md   |  8 +--
 www/posts/2021/01/version-2-0-5-released.md   | 22 ++++----
 www/posts/2021/01/version-2-0-6-released.md   | 22 ++++----
 www/posts/2021/02/version-2-0-7-released.md   | 26 ++++-----
 www/posts/2021/02/version-2-0-8-released.md   |  8 +--
 www/posts/2021/03/version-2-0-9-released.md   | 16 +++---
 www/posts/2021/04/version-2-0-10-released.md  | 10 ++--
 www/posts/2021/06/version-2-0-11-released.md  | 14 ++---
 www/posts/2021/08/version-2-0-12-released.md  | 18 +++---
 www/posts/2021/10/version-2-0-13-released.md  | 14 ++---
 www/posts/2021/11/version-2-0-14-released.md  |  4 +-
 www/posts/2022/08/version-2-0-15-released.md  | 46 +++++++--------
 www/posts/2023/08/version-2-0-16-released.md  | 22 ++++----
 www/posts/2023/08/version-2-0-17-released.md  |  6 +-
 www/posts/2023/09/version-2-0-18-released.md  |  6 +-
 www/posts/2024/10/version-2-0-19-released.md  |  6 +-
 www/posts/2024/10/version-2-0-20-released.md  |  8 +--
 www/posts/2025/03/version-2-0-21-released.md  | 24 ++++----
 www/posts/2025/07/version-2-0-22-released.md  | 32 +++++------
 66 files changed, 458 insertions(+), 458 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index df7e1f4d18..578bf5c92d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ Source
 
 The Mosquitto code is stored in a git repository.
 
-- https://github.com/eclipse/mosquitto
+- https://github.com/eclipse-mosquitto/mosquitto
 
 You can contribute bugfixes and new features by sending pull requests through GitHub.
 
@@ -41,7 +41,7 @@ Please read the [Eclipse Foundation policy on accepting contributions via Git](h
 
 ## Contributing a change
 
-1. [Fork the repository on GitHub](https://github.com/eclipse/mosquitto/fork)
+1. [Fork the repository on GitHub](https://github.com/eclipse-mosquitto/mosquitto/fork)
 2. Clone the forked repository onto your computer: ``` git clone
    https://github.com/<your username>/mosquitto.git ```
 3. If you are adding a new feature, then create a new branch from the latest
@@ -57,7 +57,7 @@ Please read the [Eclipse Foundation policy on accepting contributions via Git](h
    commits.
 9. Push the changes in your branch to your forked repository.
 10. Finally, go to
-	[https://github.com/eclipse/mosquitto](https://github.com/eclipse/mosquitto)
+	[https://github.com/eclipse-mosquitto/mosquitto](https://github.com/eclipse-mosquitto/mosquitto)
 	and create a pull request from your "YOUR_BRANCH_NAME" branch to the
 	```develop``` or ```fixes``` branch as appropriate to request review and
 	merge of the commits in your pushed branch.
@@ -80,7 +80,7 @@ Contact the project developers via the project's development
 Search for bugs:
 ----------------
 
-This project uses [Github](https://github.com/eclipse/mosquitto/issues)
+This project uses [Github](https://github.com/eclipse-mosquitto/mosquitto/issues)
 to track ongoing development and issues.
 
 Create a new bug:
@@ -89,4 +89,4 @@ Create a new bug:
 Be sure to search for existing bugs before you create another one. Remember
 that contributions are always welcome!
 
-- [Create new Mosquitto bug](https://github.com/eclipse/mosquitto/issues)
+- [Create new Mosquitto bug](https://github.com/eclipse-mosquitto/mosquitto/issues)
diff --git a/doc/joss-paper/codemeta.json b/doc/joss-paper/codemeta.json
index d23c57f059..e7bd158771 100644
--- a/doc/joss-paper/codemeta.json
+++ b/doc/joss-paper/codemeta.json
@@ -11,7 +11,7 @@
     }
   ],
   "identifier": "",
-  "codeRepository": "https://github.com/eclipse/mosquitto",
+  "codeRepository": "https://github.com/eclipse-mosquitto/mosquitto",
   "datePublished": "2017-05-17",
   "dateModified": "2017-05-17",
   "dateCreated": "2017-05-17",
diff --git a/test/broker/02-subhier-crash.py b/test/broker/02-subhier-crash.py
index e4cd623244..cc973e0e22 100755
--- a/test/broker/02-subhier-crash.py
+++ b/test/broker/02-subhier-crash.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Test related to https://github.com/eclipse/mosquitto/issues/505
+# Test related to https://github.com/eclipse-mosquitto/mosquitto/issues/505
 
 from mosq_test_helper import *
 
diff --git a/test/broker/02-subscribe-long-topic.py b/test/broker/02-subscribe-long-topic.py
index d08822419b..7d3ae093a8 100755
--- a/test/broker/02-subscribe-long-topic.py
+++ b/test/broker/02-subscribe-long-topic.py
@@ -2,7 +2,7 @@
 
 # Test whether a SUBSCRIBE to a topic with 65535 hierarchy characters fails
 # This needs checking with MOSQ_USE_VALGRIND=1 to detect memory failures
-# https://github.com/eclipse/mosquitto/issues/1412
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1412
 
 from mosq_test_helper import *
 
diff --git a/test/broker/03-publish-long-topic.py b/test/broker/03-publish-long-topic.py
index b812624c59..f8dcf0edb7 100755
--- a/test/broker/03-publish-long-topic.py
+++ b/test/broker/03-publish-long-topic.py
@@ -2,7 +2,7 @@
 
 # Test whether a PUBLISH to a topic with 65535 hierarchy characters fails
 # This needs checking with MOSQ_USE_VALGRIND=1 to detect memory failures
-# https://github.com/eclipse/mosquitto/issues/1412
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1412
 
 
 from mosq_test_helper import *
diff --git a/test/broker/05-session-expiry-v5.py b/test/broker/05-session-expiry-v5.py
index f6b0e5753f..c033212126 100755
--- a/test/broker/05-session-expiry-v5.py
+++ b/test/broker/05-session-expiry-v5.py
@@ -8,7 +8,7 @@ def do_test(start_broker):
     rc = 1
 
     # This client exists to test possible fixed size int overflow and sorting of the session intervals
-    # https://github.com/eclipse/mosquitto/issues/1525
+    # https://github.com/eclipse-mosquitto/mosquitto/issues/1525
     props = mqtt5_props.gen_uint32_prop(mqtt5_props.SESSION_EXPIRY_INTERVAL, 4294967294)
     connect0_packet = mosq_test.gen_connect("05-session-expiry-overflow", clean_session=False, proto_ver=5, properties=props)
     connack0_packet = mosq_test.gen_connack(flags=0, rc=0, proto_ver=5)
diff --git a/test/broker/06-bridge-clean-session-core.py b/test/broker/06-bridge-clean-session-core.py
index 46a2719e2b..a05d8bb27e 100755
--- a/test/broker/06-bridge-clean-session-core.py
+++ b/test/broker/06-bridge-clean-session-core.py
@@ -294,7 +294,7 @@ def make_pub(topic, mid, proto, qos=1, payload_tag="message", rc=-1):
 
 do_test(proto_ver=4, cs=cs, lcs=lcs)
 # FIXME - v5 clean session bridging doesn't work: see
-# https://github.com/eclipse/mosquitto/issues/1632
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1632
 #do_test(proto_ver=5, cs=cs, lcs=lcs)
 
 exit(0)
diff --git a/test/broker/07-will-delay-session-expiry-0.py b/test/broker/07-will-delay-session-expiry-0.py
index eded4be9a0..1212a2ebf3 100755
--- a/test/broker/07-will-delay-session-expiry-0.py
+++ b/test/broker/07-will-delay-session-expiry-0.py
@@ -3,7 +3,7 @@
 # Test whether a client that connects with a will delay that is longer than
 # their session expiry interval has their will published.
 # MQTT 5
-# https://github.com/eclipse/mosquitto/issues/1401
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1401
 
 from mosq_test_helper import *
 
diff --git a/test/broker/07-will-delay-session-expiry.py b/test/broker/07-will-delay-session-expiry.py
index a32f3999f7..3c7b0f3d08 100755
--- a/test/broker/07-will-delay-session-expiry.py
+++ b/test/broker/07-will-delay-session-expiry.py
@@ -3,7 +3,7 @@
 # Test whether a client that connects with a will delay that is longer than
 # their session expiry interval has their will published.
 # MQTT 5
-# https://github.com/eclipse/mosquitto/issues/1401
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1401
 
 from mosq_test_helper import *
 
diff --git a/test/broker/07-will-delay-session-expiry2.py b/test/broker/07-will-delay-session-expiry2.py
index b82c64749b..01f35f4720 100755
--- a/test/broker/07-will-delay-session-expiry2.py
+++ b/test/broker/07-will-delay-session-expiry2.py
@@ -3,7 +3,7 @@
 # Test whether a client that connects with a will delay that is shorter than
 # their session expiry interval has their will published.
 # MQTT 5
-# https://github.com/eclipse/mosquitto/issues/1401
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1401
 
 from mosq_test_helper import *
 
diff --git a/test/broker/07-will-reconnect-1273.py b/test/broker/07-will-reconnect-1273.py
index 398a79664f..dd6beb5555 100755
--- a/test/broker/07-will-reconnect-1273.py
+++ b/test/broker/07-will-reconnect-1273.py
@@ -2,7 +2,7 @@
 
 # Test whether a persistent client that disconnects with DISCONNECT has its
 # will published when it reconnects. It shouldn't. Bug 1273:
-# https://github.com/eclipse/mosquitto/issues/1273
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1273
 
 from mosq_test_helper import *
 
diff --git a/test/broker/08-ssl-hup-disconnect.py b/test/broker/08-ssl-hup-disconnect.py
index cb87187f13..b71cdb0709 100755
--- a/test/broker/08-ssl-hup-disconnect.py
+++ b/test/broker/08-ssl-hup-disconnect.py
@@ -3,7 +3,7 @@
 # Test whether a client connected with a client certificate when
 # use_identity_as_username is true is then disconnected when a SIGHUP is
 # received.
-# https://github.com/eclipse/mosquitto/issues/1402
+# https://github.com/eclipse-mosquitto/mosquitto/issues/1402
 
 from mosq_test_helper import *
 import signal
diff --git a/test/broker/data/REGRESSION.json b/test/broker/data/REGRESSION.json
index 0937af3749..dbb6381491 100644
--- a/test/broker/data/REGRESSION.json
+++ b/test/broker/data/REGRESSION.json
@@ -12,7 +12,7 @@
 			{ "name": "subscribe-unsubscribe-crash part 2", "ver":4, "expect_disconnect":false, "msgs": [
 				{"type":"send", "payload":"82 r14 m1234 s9 'crash/3/#' 00"},
 				{"type":"recv", "payload":"90 r3 m1234 00"}
-			], "comment": "https://github.com/eclipse/mosquitto/issues/2885"}
+			], "comment": "https://github.com/eclipse-mosquitto/mosquitto/issues/2885"}
 		]
 	},
 	{
diff --git a/www/pages/documentation/migrating-to-2-0.md b/www/pages/documentation/migrating-to-2-0.md
index 1276ce5011..cfe2064002 100644
--- a/www/pages/documentation/migrating-to-2-0.md
+++ b/www/pages/documentation/migrating-to-2-0.md
@@ -201,6 +201,6 @@ Mosquitto 2.0, you should change your instance of
 `mosquitto_auth_plugin_version` so that it returns the version of the plugin
 interface that you support, i.e. `4`.
 
-[misc/letsencrypt/mosquitto-copy.sh]:https://github.com/eclipse/mosquitto/tree/master/misc/letsencrypt
+[misc/letsencrypt/mosquitto-copy.sh]:https://github.com/eclipse-mosquitto/mosquitto/tree/master/misc/letsencrypt
 [dynamic-security plugin]:/documentation/dynamic-security/
 [mosquitto-go-auth plugin]:https://github.com/iegomez/mosquitto-go-auth
diff --git a/www/pages/index.html b/www/pages/index.html
index 00858e548e..20c2ad6903 100644
--- a/www/pages/index.html
+++ b/www/pages/index.html
@@ -66,7 +66,7 @@ <h2 style="text-align: center">Test</h2>
 			<div class="column column-justify">
 				<h2 style="text-align: center">Community</h2>
 				<ul>
-				<li>Report bugs or submit changes on the <a href="https://github.com/eclipse/mosquitto">Github repository</a></li>
+				<li>Report bugs or submit changes on the <a href="https://github.com/eclipse-mosquitto/mosquitto">Github repository</a></li>
 				<li>Talk to other users on the <a href="https://dev.eclipse.org/mailman/listinfo/mosquitto-dev">Mosquitto mailing list</a>
 				or on <a href="https://eclipse-iot-wg.slack.com/join/shared_invite/zt-d8zil9s0-NF5UHh92Odf3AbonspswHA#/">Slack</a>.</li>
 				<li>Get help from the <a href="https://forum.cedalo.com/">forums</a>.</li>
diff --git a/www/posts/2016/03/repository-moved-to-github.md b/www/posts/2016/03/repository-moved-to-github.md
index e442276be3..d899203fb7 100644
--- a/www/posts/2016/03/repository-moved-to-github.md
+++ b/www/posts/2016/03/repository-moved-to-github.md
@@ -10,7 +10,7 @@
 -->
 
 The mosquitto repository is now hosted on github:
-<https://github.com/eclipse/mosquitto> This is now the canonical location for
+<https://github.com/eclipse-mosquitto/mosquitto> This is now the canonical location for
 mosquitto development work.
 
 Bug reports should also be made on github and the existing bug reports will be
diff --git a/www/posts/2016/06/version-1-4-9-released.md b/www/posts/2016/06/version-1-4-9-released.md
index c63af1e229..1843738c6c 100644
--- a/www/posts/2016/06/version-1-4-9-released.md
+++ b/www/posts/2016/06/version-1-4-9-released.md
@@ -58,15 +58,15 @@ This is a bugfix release.
  * Fix string quoting in CMakeLists.txt. Closes [#4].
  * Fix building on Visual Studio 2015. Closes [#136].
 
-[#1]: https://github.com/eclipse/mosquitto/issues/1
-[#4]: https://github.com/eclipse/mosquitto/issues/4
-[#5]: https://github.com/eclipse/mosquitto/issues/5
-[#57]: https://github.com/eclipse/mosquitto/issues/57
-[#136]: https://github.com/eclipse/mosquitto/issues/136
-[#150]: https://github.com/eclipse/mosquitto/issues/150
-[#151]: https://github.com/eclipse/mosquitto/issues/151
-[#154]: https://github.com/eclipse/mosquitto/issues/154
-[#166]: https://github.com/eclipse/mosquitto/issues/166
-[#169]: https://github.com/eclipse/mosquitto/issues/169
-[#170]: https://github.com/eclipse/mosquitto/issues/170
-[#180]: https://github.com/eclipse/mosquitto/issues/180
+[#1]: https://github.com/eclipse-mosquitto/mosquitto/issues/1
+[#4]: https://github.com/eclipse-mosquitto/mosquitto/issues/4
+[#5]: https://github.com/eclipse-mosquitto/mosquitto/issues/5
+[#57]: https://github.com/eclipse-mosquitto/mosquitto/issues/57
+[#136]: https://github.com/eclipse-mosquitto/mosquitto/issues/136
+[#150]: https://github.com/eclipse-mosquitto/mosquitto/issues/150
+[#151]: https://github.com/eclipse-mosquitto/mosquitto/issues/151
+[#154]: https://github.com/eclipse-mosquitto/mosquitto/issues/154
+[#166]: https://github.com/eclipse-mosquitto/mosquitto/issues/166
+[#169]: https://github.com/eclipse-mosquitto/mosquitto/issues/169
+[#170]: https://github.com/eclipse-mosquitto/mosquitto/issues/170
+[#180]: https://github.com/eclipse-mosquitto/mosquitto/issues/180
diff --git a/www/posts/2016/08/version-1-4-10-released.md b/www/posts/2016/08/version-1-4-10-released.md
index adec67f0f6..ddd60985ec 100644
--- a/www/posts/2016/08/version-1-4-10-released.md
+++ b/www/posts/2016/08/version-1-4-10-released.md
@@ -36,12 +36,12 @@ This is a bugfix release.
 
  * Don't attempt to install docs when `WITH_DOCS=no`. Closes [#184].
 
-[#7]: https://github.com/eclipse/mosquitto/issues/7
-[#184]: https://github.com/eclipse/mosquitto/issues/184
-[#186]: https://github.com/eclipse/mosquitto/issues/186
-[#189]: https://github.com/eclipse/mosquitto/issues/189
-[#191]: https://github.com/eclipse/mosquitto/issues/191
-[#198]: https://github.com/eclipse/mosquitto/issues/198
-[#222]: https://github.com/eclipse/mosquitto/issues/222
-[#234]: https://github.com/eclipse/mosquitto/issues/234
-[#237]: https://github.com/eclipse/mosquitto/issues/237
+[#7]: https://github.com/eclipse-mosquitto/mosquitto/issues/7
+[#184]: https://github.com/eclipse-mosquitto/mosquitto/issues/184
+[#186]: https://github.com/eclipse-mosquitto/mosquitto/issues/186
+[#189]: https://github.com/eclipse-mosquitto/mosquitto/issues/189
+[#191]: https://github.com/eclipse-mosquitto/mosquitto/issues/191
+[#198]: https://github.com/eclipse-mosquitto/mosquitto/issues/198
+[#222]: https://github.com/eclipse-mosquitto/mosquitto/issues/222
+[#234]: https://github.com/eclipse-mosquitto/mosquitto/issues/234
+[#237]: https://github.com/eclipse-mosquitto/mosquitto/issues/237
diff --git a/www/posts/2017/02/version-1-4-11-released.md b/www/posts/2017/02/version-1-4-11-released.md
index 58bb604968..8739ae8981 100644
--- a/www/posts/2017/02/version-1-4-11-released.md
+++ b/www/posts/2017/02/version-1-4-11-released.md
@@ -35,11 +35,11 @@ This is a bugfix release.
  * Fix potential socket leakage when reconnecting. Closes [#304].
  * Fix potential negative timeout being passed to pselect. Closes [#329].
 
-[#259]: https://github.com/eclipse/mosquitto/issues/259
-[#271]: https://github.com/eclipse/mosquitto/issues/271
-[#304]: https://github.com/eclipse/mosquitto/issues/304
-[#316]: https://github.com/eclipse/mosquitto/issues/316
-[#329]: https://github.com/eclipse/mosquitto/issues/329
-[#354]: https://github.com/eclipse/mosquitto/issues/354
-[#379]: https://github.com/eclipse/mosquitto/issues/379
-[#380]: https://github.com/eclipse/mosquitto/issues/380
+[#259]: https://github.com/eclipse-mosquitto/mosquitto/issues/259
+[#271]: https://github.com/eclipse-mosquitto/mosquitto/issues/271
+[#304]: https://github.com/eclipse-mosquitto/mosquitto/issues/304
+[#316]: https://github.com/eclipse-mosquitto/mosquitto/issues/316
+[#329]: https://github.com/eclipse-mosquitto/mosquitto/issues/329
+[#354]: https://github.com/eclipse-mosquitto/mosquitto/issues/354
+[#379]: https://github.com/eclipse-mosquitto/mosquitto/issues/379
+[#380]: https://github.com/eclipse-mosquitto/mosquitto/issues/380
diff --git a/www/posts/2017/05/security-advisory-cve-2017-7650.md b/www/posts/2017/05/security-advisory-cve-2017-7650.md
index 8ba6281e8c..cd883fc2c6 100644
--- a/www/posts/2017/05/security-advisory-cve-2017-7650.md
+++ b/www/posts/2017/05/security-advisory-cve-2017-7650.md
@@ -49,9 +49,9 @@ Complete list of fixes addressed in version 1.4.12:
  * Fix [CVE-2017-7650].
 
 [CVE-2017-7650]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7650
-[#415]: https://github.com/eclipse/mosquitto/issues/415
-[#416]: https://github.com/eclipse/mosquitto/issues/416
-[#424]: https://github.com/eclipse/mosquitto/issues/424
-[#428]: https://github.com/eclipse/mosquitto/issues/428
-[#426]: https://github.com/eclipse/mosquitto/issues/426
-[#446]: https://github.com/eclipse/mosquitto/issues/446
+[#415]: https://github.com/eclipse-mosquitto/mosquitto/issues/415
+[#416]: https://github.com/eclipse-mosquitto/mosquitto/issues/416
+[#424]: https://github.com/eclipse-mosquitto/mosquitto/issues/424
+[#428]: https://github.com/eclipse-mosquitto/mosquitto/issues/428
+[#426]: https://github.com/eclipse-mosquitto/mosquitto/issues/426
+[#446]: https://github.com/eclipse-mosquitto/mosquitto/issues/446
diff --git a/www/posts/2017/07/version-1-4-13-released.md b/www/posts/2017/07/version-1-4-13-released.md
index d9b1631cc7..fcc819c239 100644
--- a/www/posts/2017/07/version-1-4-13-released.md
+++ b/www/posts/2017/07/version-1-4-13-released.md
@@ -42,8 +42,8 @@ This is a bugfix and security release.
 
 [CVE-2017-7650]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7650
 [CVE-2017-9868]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-9868
-[#417]: https://github.com/eclipse/mosquitto/issues/417
-[#427]: https://github.com/eclipse/mosquitto/issues/427
-[#462]: https://github.com/eclipse/mosquitto/issues/462
-[#468]: https://github.com/eclipse/mosquitto/issues/468
-[#477]: https://github.com/eclipse/mosquitto/issues/477
+[#417]: https://github.com/eclipse-mosquitto/mosquitto/issues/417
+[#427]: https://github.com/eclipse-mosquitto/mosquitto/issues/427
+[#462]: https://github.com/eclipse-mosquitto/mosquitto/issues/462
+[#468]: https://github.com/eclipse-mosquitto/mosquitto/issues/468
+[#477]: https://github.com/eclipse-mosquitto/mosquitto/issues/477
diff --git a/www/posts/2018/02/security-advisory-cve-2017-7651-cve-2017-7652.md b/www/posts/2018/02/security-advisory-cve-2017-7651-cve-2017-7652.md
index 977c9cf837..11b7861e83 100644
--- a/www/posts/2018/02/security-advisory-cve-2017-7651-cve-2017-7652.md
+++ b/www/posts/2018/02/security-advisory-cve-2017-7651-cve-2017-7652.md
@@ -96,14 +96,14 @@ The complete list of fixes addressed in version 1.4.15 is:
 
 [CVE-2017-7651]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7651
 [CVE-2017-7652]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-7652
-[#8]: https://github.com/eclipse/mosquitto/issues/8
-[#250]: https://github.com/eclipse/mosquitto/issues/250
-[#490]: https://github.com/eclipse/mosquitto/issues/490
-[#507]: https://github.com/eclipse/mosquitto/issues/507
-[#534]: https://github.com/eclipse/mosquitto/issues/534
-[#636]: https://github.com/eclipse/mosquitto/issues/636
-[#649]: https://github.com/eclipse/mosquitto/issues/649
-[#652]: https://github.com/eclipse/mosquitto/issues/652
-[#654]: https://github.com/eclipse/mosquitto/issues/654
-[#670]: https://github.com/eclipse/mosquitto/issues/670
-[#676]: https://github.com/eclipse/mosquitto/issues/676
+[#8]: https://github.com/eclipse-mosquitto/mosquitto/issues/8
+[#250]: https://github.com/eclipse-mosquitto/mosquitto/issues/250
+[#490]: https://github.com/eclipse-mosquitto/mosquitto/issues/490
+[#507]: https://github.com/eclipse-mosquitto/mosquitto/issues/507
+[#534]: https://github.com/eclipse-mosquitto/mosquitto/issues/534
+[#636]: https://github.com/eclipse-mosquitto/mosquitto/issues/636
+[#649]: https://github.com/eclipse-mosquitto/mosquitto/issues/649
+[#652]: https://github.com/eclipse-mosquitto/mosquitto/issues/652
+[#654]: https://github.com/eclipse-mosquitto/mosquitto/issues/654
+[#670]: https://github.com/eclipse-mosquitto/mosquitto/issues/670
+[#676]: https://github.com/eclipse-mosquitto/mosquitto/issues/676
diff --git a/www/posts/2018/08/version-151-released.md b/www/posts/2018/08/version-151-released.md
index 4bc92906b0..9cb275b881 100644
--- a/www/posts/2018/08/version-151-released.md
+++ b/www/posts/2018/08/version-151-released.md
@@ -70,18 +70,18 @@ This is a bugfix release.
 - Add support for compiling with static libwebsockets library.
 
 
-[#209]: https://github.com/eclipse/mosquitto/issues/209
-[#240]: https://github.com/eclipse/mosquitto/issues/240
-[#258]: https://github.com/eclipse/mosquitto/issues/258
-[#813]: https://github.com/eclipse/mosquitto/issues/813
-[#833]: https://github.com/eclipse/mosquitto/issues/833
-[#848]: https://github.com/eclipse/mosquitto/issues/848
-[#849]: https://github.com/eclipse/mosquitto/issues/849
-[#851]: https://github.com/eclipse/mosquitto/issues/851
-[#860]: https://github.com/eclipse/mosquitto/issues/860
-[#863]: https://github.com/eclipse/mosquitto/issues/863
-[#869]: https://github.com/eclipse/mosquitto/issues/869
-[#886]: https://github.com/eclipse/mosquitto/issues/886
-[#900]: https://github.com/eclipse/mosquitto/issues/900
-[#901]: https://github.com/eclipse/mosquitto/issues/901
-[#903]: https://github.com/eclipse/mosquitto/issues/903
+[#209]: https://github.com/eclipse-mosquitto/mosquitto/issues/209
+[#240]: https://github.com/eclipse-mosquitto/mosquitto/issues/240
+[#258]: https://github.com/eclipse-mosquitto/mosquitto/issues/258
+[#813]: https://github.com/eclipse-mosquitto/mosquitto/issues/813
+[#833]: https://github.com/eclipse-mosquitto/mosquitto/issues/833
+[#848]: https://github.com/eclipse-mosquitto/mosquitto/issues/848
+[#849]: https://github.com/eclipse-mosquitto/mosquitto/issues/849
+[#851]: https://github.com/eclipse-mosquitto/mosquitto/issues/851
+[#860]: https://github.com/eclipse-mosquitto/mosquitto/issues/860
+[#863]: https://github.com/eclipse-mosquitto/mosquitto/issues/863
+[#869]: https://github.com/eclipse-mosquitto/mosquitto/issues/869
+[#886]: https://github.com/eclipse-mosquitto/mosquitto/issues/886
+[#900]: https://github.com/eclipse-mosquitto/mosquitto/issues/900
+[#901]: https://github.com/eclipse-mosquitto/mosquitto/issues/901
+[#903]: https://github.com/eclipse-mosquitto/mosquitto/issues/903
diff --git a/www/posts/2018/09/security-advisory-cve-2018-12543.md b/www/posts/2018/09/security-advisory-cve-2018-12543.md
index 0e33b4efdd..0d7a21ee17 100644
--- a/www/posts/2018/09/security-advisory-cve-2018-12543.md
+++ b/www/posts/2018/09/security-advisory-cve-2018-12543.md
@@ -52,8 +52,8 @@ The complete list of fixes addressed in version 1.5.3 is:
 * Various fixes to ease building.
 
 [CVE-2018-12543]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12543
-[#520]: https://github.com/eclipse/mosquitto/issues/520
-[#566]: https://github.com/eclipse/mosquitto/issues/566
-[#600]: https://github.com/eclipse/mosquitto/issues/600
-[#645]: https://github.com/eclipse/mosquitto/issues/645
-[#701]: https://github.com/eclipse/mosquitto/issues/701
+[#520]: https://github.com/eclipse-mosquitto/mosquitto/issues/520
+[#566]: https://github.com/eclipse-mosquitto/mosquitto/issues/566
+[#600]: https://github.com/eclipse-mosquitto/mosquitto/issues/600
+[#645]: https://github.com/eclipse-mosquitto/mosquitto/issues/645
+[#701]: https://github.com/eclipse-mosquitto/mosquitto/issues/701
diff --git a/www/posts/2018/09/version-152-released.md b/www/posts/2018/09/version-152-released.md
index fe47204e12..5e665ae27a 100644
--- a/www/posts/2018/09/version-152-released.md
+++ b/www/posts/2018/09/version-152-released.md
@@ -32,9 +32,9 @@ This is a bugfix release.
 - Make it easier to build without bundled uthash.h using `WITH_BUNDLED_DEPS=no`.
 - Fix build with OPENSSL_NO_ENGINE. Closes [#932].
 
-[#481]: https://github.com/eclipse/mosquitto/issues/481
-[#927]: https://github.com/eclipse/mosquitto/issues/927
-[#932]: https://github.com/eclipse/mosquitto/issues/932
-[#941]: https://github.com/eclipse/mosquitto/issues/941
-[#948]: https://github.com/eclipse/mosquitto/issues/948
-[#965]: https://github.com/eclipse/mosquitto/issues/965
+[#481]: https://github.com/eclipse-mosquitto/mosquitto/issues/481
+[#927]: https://github.com/eclipse-mosquitto/mosquitto/issues/927
+[#932]: https://github.com/eclipse-mosquitto/mosquitto/issues/932
+[#941]: https://github.com/eclipse-mosquitto/mosquitto/issues/941
+[#948]: https://github.com/eclipse-mosquitto/mosquitto/issues/948
+[#965]: https://github.com/eclipse-mosquitto/mosquitto/issues/965
diff --git a/www/posts/2018/11/mqtt5-progress.md b/www/posts/2018/11/mqtt5-progress.md
index c2221b4292..c2be2a836a 100644
--- a/www/posts/2018/11/mqtt5-progress.md
+++ b/www/posts/2018/11/mqtt5-progress.md
@@ -55,5 +55,5 @@ mosquitto_pub -t topic -m '{"key":"value"}' -D publish content-type "application
 
 Further updates will be posted when more features are available.
 
-[repository]: https://github.com/eclipse/mosquitto/tree/mqtt5
+[repository]: https://github.com/eclipse-mosquitto/mosquitto/tree/mqtt5
 [roadmap]: https://mosquitto.org/roadmap/
diff --git a/www/posts/2018/11/version-154-released.md b/www/posts/2018/11/version-154-released.md
index 8b30f5f8e4..079abe833d 100644
--- a/www/posts/2018/11/version-154-released.md
+++ b/www/posts/2018/11/version-154-released.md
@@ -45,15 +45,15 @@ This is a bugfix and security release.
   Closes [#862] and [#933].
 - Fix builds on QNX 7.0.0. Closes [#1018].
 
-[#7]: https://github.com/eclipse/mosquitto/issues/7
-[#287]: https://github.com/eclipse/mosquitto/issues/287
-[#592]: https://github.com/eclipse/mosquitto/issues/592
-[#933]: https://github.com/eclipse/mosquitto/issues/933
-[#977]: https://github.com/eclipse/mosquitto/issues/977
-[#983]: https://github.com/eclipse/mosquitto/issues/983
-[#990]: https://github.com/eclipse/mosquitto/issues/990
-[#996]: https://github.com/eclipse/mosquitto/issues/996
-[#1015]: https://github.com/eclipse/mosquitto/issues/1015
-[#1016]: https://github.com/eclipse/mosquitto/issues/1016
-[#1018]: https://github.com/eclipse/mosquitto/issues/1018
-[#1019]: https://github.com/eclipse/mosquitto/issues/1019
+[#7]: https://github.com/eclipse-mosquitto/mosquitto/issues/7
+[#287]: https://github.com/eclipse-mosquitto/mosquitto/issues/287
+[#592]: https://github.com/eclipse-mosquitto/mosquitto/issues/592
+[#933]: https://github.com/eclipse-mosquitto/mosquitto/issues/933
+[#977]: https://github.com/eclipse-mosquitto/mosquitto/issues/977
+[#983]: https://github.com/eclipse-mosquitto/mosquitto/issues/983
+[#990]: https://github.com/eclipse-mosquitto/mosquitto/issues/990
+[#996]: https://github.com/eclipse-mosquitto/mosquitto/issues/996
+[#1015]: https://github.com/eclipse-mosquitto/mosquitto/issues/1015
+[#1016]: https://github.com/eclipse-mosquitto/mosquitto/issues/1016
+[#1018]: https://github.com/eclipse-mosquitto/mosquitto/issues/1018
+[#1019]: https://github.com/eclipse-mosquitto/mosquitto/issues/1019
diff --git a/www/posts/2018/12/version-155-released.md b/www/posts/2018/12/version-155-released.md
index 95359cb2ab..9280474a82 100644
--- a/www/posts/2018/12/version-155-released.md
+++ b/www/posts/2018/12/version-155-released.md
@@ -48,15 +48,15 @@ This is a bugfix and security release.
 
 
 [CVE-2018-20145]: https://nvd.nist.gov/vuln/detail/CVE-2018-20145
-[#68]: https://github.com/eclipse/mosquitto/issues/68
-[#537]: https://github.com/eclipse/mosquitto/issues/537
-[#613]: https://github.com/eclipse/mosquitto/issues/613
-[#772]: https://github.com/eclipse/mosquitto/issues/772
-[#1004]: https://github.com/eclipse/mosquitto/issues/1004
-[#1027]: https://github.com/eclipse/mosquitto/issues/1027
-[#1040]: https://github.com/eclipse/mosquitto/issues/1040
-[#1062]: https://github.com/eclipse/mosquitto/issues/1062
-[#1066]: https://github.com/eclipse/mosquitto/issues/1066
-[#1067]: https://github.com/eclipse/mosquitto/issues/1067
-[#1068]: https://github.com/eclipse/mosquitto/issues/1068
-[#1073]: https://github.com/eclipse/mosquitto/issues/1073
+[#68]: https://github.com/eclipse-mosquitto/mosquitto/issues/68
+[#537]: https://github.com/eclipse-mosquitto/mosquitto/issues/537
+[#613]: https://github.com/eclipse-mosquitto/mosquitto/issues/613
+[#772]: https://github.com/eclipse-mosquitto/mosquitto/issues/772
+[#1004]: https://github.com/eclipse-mosquitto/mosquitto/issues/1004
+[#1027]: https://github.com/eclipse-mosquitto/mosquitto/issues/1027
+[#1040]: https://github.com/eclipse-mosquitto/mosquitto/issues/1040
+[#1062]: https://github.com/eclipse-mosquitto/mosquitto/issues/1062
+[#1066]: https://github.com/eclipse-mosquitto/mosquitto/issues/1066
+[#1067]: https://github.com/eclipse-mosquitto/mosquitto/issues/1067
+[#1068]: https://github.com/eclipse-mosquitto/mosquitto/issues/1068
+[#1073]: https://github.com/eclipse-mosquitto/mosquitto/issues/1073
diff --git a/www/posts/2019/02/version-1-5-6-released.md b/www/posts/2019/02/version-1-5-6-released.md
index 27582620f1..42d9e33498 100644
--- a/www/posts/2019/02/version-1-5-6-released.md
+++ b/www/posts/2019/02/version-1-5-6-released.md
@@ -78,12 +78,12 @@ The list of other fixes addressed in version 1.5.6 is:
   Closes [#1094].
 - Man pages can now be built on any system. Closes [#1139].
 
-[#1080]: https://github.com/eclipse/mosquitto/issues/1080
-[#1081]: https://github.com/eclipse/mosquitto/issues/1081
-[#1094]: https://github.com/eclipse/mosquitto/issues/1094
-[#1101]: https://github.com/eclipse/mosquitto/issues/1101
-[#1131]: https://github.com/eclipse/mosquitto/issues/1131
-[#1137]: https://github.com/eclipse/mosquitto/issues/1137
-[#1139]: https://github.com/eclipse/mosquitto/issues/1139
-[#1143]: https://github.com/eclipse/mosquitto/issues/1143
-[#1144]: https://github.com/eclipse/mosquitto/issues/1144
+[#1080]: https://github.com/eclipse-mosquitto/mosquitto/issues/1080
+[#1081]: https://github.com/eclipse-mosquitto/mosquitto/issues/1081
+[#1094]: https://github.com/eclipse-mosquitto/mosquitto/issues/1094
+[#1101]: https://github.com/eclipse-mosquitto/mosquitto/issues/1101
+[#1131]: https://github.com/eclipse-mosquitto/mosquitto/issues/1131
+[#1137]: https://github.com/eclipse-mosquitto/mosquitto/issues/1137
+[#1139]: https://github.com/eclipse-mosquitto/mosquitto/issues/1139
+[#1143]: https://github.com/eclipse-mosquitto/mosquitto/issues/1143
+[#1144]: https://github.com/eclipse-mosquitto/mosquitto/issues/1144
diff --git a/www/posts/2019/02/version-1-5-7-released.md b/www/posts/2019/02/version-1-5-7-released.md
index 710bada522..3ef07c3bb6 100644
--- a/www/posts/2019/02/version-1-5-7-released.md
+++ b/www/posts/2019/02/version-1-5-7-released.md
@@ -31,6 +31,6 @@ This is a bugfix release.
 - Add rewritten build test script and remove some build warnings.
 
 
-[#389]: https://github.com/eclipse/mosquitto/issues/389
-[#1149]: https://github.com/eclipse/mosquitto/issues/1149
-[#1154]: https://github.com/eclipse/mosquitto/issues/1154
+[#389]: https://github.com/eclipse-mosquitto/mosquitto/issues/389
+[#1149]: https://github.com/eclipse-mosquitto/mosquitto/issues/1149
+[#1154]: https://github.com/eclipse-mosquitto/mosquitto/issues/1154
diff --git a/www/posts/2019/02/version-1-5-8-released.md b/www/posts/2019/02/version-1-5-8-released.md
index c4f5255635..f632610942 100644
--- a/www/posts/2019/02/version-1-5-8-released.md
+++ b/www/posts/2019/02/version-1-5-8-released.md
@@ -28,7 +28,7 @@ This is a bugfix release.
 - Fix some Coverity Scan reported errors that could occur when the library was
   already quitting.
 
-[#1032]: https://github.com/eclipse/mosquitto/issues/1032
-[#1162]: https://github.com/eclipse/mosquitto/issues/1162
-[#1174]: https://github.com/eclipse/mosquitto/issues/1174
-[#1177]: https://github.com/eclipse/mosquitto/issues/1177
+[#1032]: https://github.com/eclipse-mosquitto/mosquitto/issues/1032
+[#1162]: https://github.com/eclipse-mosquitto/mosquitto/issues/1162
+[#1174]: https://github.com/eclipse-mosquitto/mosquitto/issues/1174
+[#1177]: https://github.com/eclipse-mosquitto/mosquitto/issues/1177
diff --git a/www/posts/2019/04/version-1-6-1-released.md b/www/posts/2019/04/version-1-6-1-released.md
index a432f410a1..1212c04b81 100644
--- a/www/posts/2019/04/version-1-6-1-released.md
+++ b/www/posts/2019/04/version-1-6-1-released.md
@@ -27,8 +27,8 @@ Mosquitto.
 - Don't call ldconfig in CMake scripts. Closes [#1048].
 - Use `CMAKE_INSTALL_*` variables when installing in CMake. Closes [#1049].
 
-[#1048]: https://github.com/eclipse/mosquitto/issues/1048
-[#1049]: https://github.com/eclipse/mosquitto/issues/1049
-[#1230]: https://github.com/eclipse/mosquitto/issues/1230
-[#1231]: https://github.com/eclipse/mosquitto/issues/1231
-[#1232]: https://github.com/eclipse/mosquitto/issues/1232
+[#1048]: https://github.com/eclipse-mosquitto/mosquitto/issues/1048
+[#1049]: https://github.com/eclipse-mosquitto/mosquitto/issues/1049
+[#1230]: https://github.com/eclipse-mosquitto/mosquitto/issues/1230
+[#1231]: https://github.com/eclipse-mosquitto/mosquitto/issues/1231
+[#1232]: https://github.com/eclipse-mosquitto/mosquitto/issues/1232
diff --git a/www/posts/2019/04/version-1-6-2-released.md b/www/posts/2019/04/version-1-6-2-released.md
index b5fa1e600c..cb98e801ba 100644
--- a/www/posts/2019/04/version-1-6-2-released.md
+++ b/www/posts/2019/04/version-1-6-2-released.md
@@ -40,7 +40,7 @@ memory, resulting in a possible crash.
 ## Clients
 - Fix `-L` url parsing. Closes [#1248].
 
-[#1244]: https://github.com/eclipse/mosquitto/issues/1244
-[#1245]: https://github.com/eclipse/mosquitto/issues/1245
-[#1246]: https://github.com/eclipse/mosquitto/issues/1246
-[#1250]: https://github.com/eclipse/mosquitto/issues/1250
+[#1244]: https://github.com/eclipse-mosquitto/mosquitto/issues/1244
+[#1245]: https://github.com/eclipse-mosquitto/mosquitto/issues/1245
+[#1246]: https://github.com/eclipse-mosquitto/mosquitto/issues/1246
+[#1250]: https://github.com/eclipse-mosquitto/mosquitto/issues/1250
diff --git a/www/posts/2019/04/version-1-6-released.md b/www/posts/2019/04/version-1-6-released.md
index 33b6966087..fce31c461a 100644
--- a/www/posts/2019/04/version-1-6-released.md
+++ b/www/posts/2019/04/version-1-6-released.md
@@ -148,7 +148,7 @@ fixes and improvements that have been made:
   output format. Closes [#1220].
 
 
-[#924]: https://github.com/eclipse/mosquitto/issues/924
-[#1208]: https://github.com/eclipse/mosquitto/issues/1208
-[#1212]: https://github.com/eclipse/mosquitto/issues/1212
-[#1220]: https://github.com/eclipse/mosquitto/issues/1220
+[#924]: https://github.com/eclipse-mosquitto/mosquitto/issues/924
+[#1208]: https://github.com/eclipse-mosquitto/mosquitto/issues/1208
+[#1212]: https://github.com/eclipse-mosquitto/mosquitto/issues/1212
+[#1220]: https://github.com/eclipse-mosquitto/mosquitto/issues/1220
diff --git a/www/posts/2019/06/version-1-6-3-released.md b/www/posts/2019/06/version-1-6-3-released.md
index 5edcfff27d..e0f5dd0241 100644
--- a/www/posts/2019/06/version-1-6-3-released.md
+++ b/www/posts/2019/06/version-1-6-3-released.md
@@ -65,20 +65,20 @@ This is a bugfix release.
 ## Build
 - CLIENT_LDFLAGS now uses LDFLAGS. Closes [#1294].
 
-[#1152]: https://github.com/eclipse/mosquitto/issues/1152
-[#1227]: https://github.com/eclipse/mosquitto/issues/1227
-[#1257]: https://github.com/eclipse/mosquitto/issues/1257
-[#1263]: https://github.com/eclipse/mosquitto/issues/1263
-[#1264]: https://github.com/eclipse/mosquitto/issues/1264
-[#1266]: https://github.com/eclipse/mosquitto/issues/1266
-[#1273]: https://github.com/eclipse/mosquitto/issues/1273
-[#1273]: https://github.com/eclipse/mosquitto/issues/1273
-[#1273]: https://github.com/eclipse/mosquitto/issues/1273
-[#1274]: https://github.com/eclipse/mosquitto/issues/1274
-[#1276]: https://github.com/eclipse/mosquitto/issues/1276
-[#1280]: https://github.com/eclipse/mosquitto/issues/1280
-[#1284]: https://github.com/eclipse/mosquitto/issues/1284
-[#1285]: https://github.com/eclipse/mosquitto/issues/1285
-[#1290]: https://github.com/eclipse/mosquitto/issues/1290
-[#1294]: https://github.com/eclipse/mosquitto/issues/1294
-[#1302]: https://github.com/eclipse/mosquitto/issues/1302
+[#1152]: https://github.com/eclipse-mosquitto/mosquitto/issues/1152
+[#1227]: https://github.com/eclipse-mosquitto/mosquitto/issues/1227
+[#1257]: https://github.com/eclipse-mosquitto/mosquitto/issues/1257
+[#1263]: https://github.com/eclipse-mosquitto/mosquitto/issues/1263
+[#1264]: https://github.com/eclipse-mosquitto/mosquitto/issues/1264
+[#1266]: https://github.com/eclipse-mosquitto/mosquitto/issues/1266
+[#1273]: https://github.com/eclipse-mosquitto/mosquitto/issues/1273
+[#1273]: https://github.com/eclipse-mosquitto/mosquitto/issues/1273
+[#1273]: https://github.com/eclipse-mosquitto/mosquitto/issues/1273
+[#1274]: https://github.com/eclipse-mosquitto/mosquitto/issues/1274
+[#1276]: https://github.com/eclipse-mosquitto/mosquitto/issues/1276
+[#1280]: https://github.com/eclipse-mosquitto/mosquitto/issues/1280
+[#1284]: https://github.com/eclipse-mosquitto/mosquitto/issues/1284
+[#1285]: https://github.com/eclipse-mosquitto/mosquitto/issues/1285
+[#1290]: https://github.com/eclipse-mosquitto/mosquitto/issues/1290
+[#1294]: https://github.com/eclipse-mosquitto/mosquitto/issues/1294
+[#1302]: https://github.com/eclipse-mosquitto/mosquitto/issues/1302
diff --git a/www/posts/2019/08/version-1-6-4-released.md b/www/posts/2019/08/version-1-6-4-released.md
index 6b3ca1af1a..19f8ec5808 100644
--- a/www/posts/2019/08/version-1-6-4-released.md
+++ b/www/posts/2019/08/version-1-6-4-released.md
@@ -45,12 +45,12 @@ This is a bugfix release.
 ## Other
 - Various documentation fixes.
 
-[#515]: https://github.com/eclipse/mosquitto/issues/515
-[#1272]: https://github.com/eclipse/mosquitto/issues/1272
-[#1322]: https://github.com/eclipse/mosquitto/issues/1322
-[#1332]: https://github.com/eclipse/mosquitto/issues/1332
-[#1344]: https://github.com/eclipse/mosquitto/issues/1344
-[#1345]: https://github.com/eclipse/mosquitto/issues/1345
-[#1353]: https://github.com/eclipse/mosquitto/issues/1353
-[#1354]: https://github.com/eclipse/mosquitto/issues/1354
-[#1360]: https://github.com/eclipse/mosquitto/issues/1360
+[#515]: https://github.com/eclipse-mosquitto/mosquitto/issues/515
+[#1272]: https://github.com/eclipse-mosquitto/mosquitto/issues/1272
+[#1322]: https://github.com/eclipse-mosquitto/mosquitto/issues/1322
+[#1332]: https://github.com/eclipse-mosquitto/mosquitto/issues/1332
+[#1344]: https://github.com/eclipse-mosquitto/mosquitto/issues/1344
+[#1345]: https://github.com/eclipse-mosquitto/mosquitto/issues/1345
+[#1353]: https://github.com/eclipse-mosquitto/mosquitto/issues/1353
+[#1354]: https://github.com/eclipse-mosquitto/mosquitto/issues/1354
+[#1360]: https://github.com/eclipse-mosquitto/mosquitto/issues/1360
diff --git a/www/posts/2019/09/version-1-6-5-released.md b/www/posts/2019/09/version-1-6-5-released.md
index ce8b867f50..df763077fb 100644
--- a/www/posts/2019/09/version-1-6-5-released.md
+++ b/www/posts/2019/09/version-1-6-5-released.md
@@ -52,16 +52,16 @@ This is a bugfix release.
 - Guard `ssize_t` definition on Windows. Closes [#522].
 
 
-[#35]: https://github.com/eclipse/mosquitto/issues/35
-[#274]: https://github.com/eclipse/mosquitto/issues/274
-[#448]: https://github.com/eclipse/mosquitto/issues/448
-[#478]: https://github.com/eclipse/mosquitto/issues/478
-[#522]: https://github.com/eclipse/mosquitto/issues/522
-[#737]: https://github.com/eclipse/mosquitto/issues/737
-[#1367]: https://github.com/eclipse/mosquitto/issues/1367
-[#1369]: https://github.com/eclipse/mosquitto/issues/1369
-[#1374]: https://github.com/eclipse/mosquitto/issues/1374
-[#1390]: https://github.com/eclipse/mosquitto/issues/1390
-[#1391]: https://github.com/eclipse/mosquitto/issues/1391
-[#1401]: https://github.com/eclipse/mosquitto/issues/1401
-[#1402]: https://github.com/eclipse/mosquitto/issues/1402
+[#35]: https://github.com/eclipse-mosquitto/mosquitto/issues/35
+[#274]: https://github.com/eclipse-mosquitto/mosquitto/issues/274
+[#448]: https://github.com/eclipse-mosquitto/mosquitto/issues/448
+[#478]: https://github.com/eclipse-mosquitto/mosquitto/issues/478
+[#522]: https://github.com/eclipse-mosquitto/mosquitto/issues/522
+[#737]: https://github.com/eclipse-mosquitto/mosquitto/issues/737
+[#1367]: https://github.com/eclipse-mosquitto/mosquitto/issues/1367
+[#1369]: https://github.com/eclipse-mosquitto/mosquitto/issues/1369
+[#1374]: https://github.com/eclipse-mosquitto/mosquitto/issues/1374
+[#1390]: https://github.com/eclipse-mosquitto/mosquitto/issues/1390
+[#1391]: https://github.com/eclipse-mosquitto/mosquitto/issues/1391
+[#1401]: https://github.com/eclipse-mosquitto/mosquitto/issues/1401
+[#1402]: https://github.com/eclipse-mosquitto/mosquitto/issues/1402
diff --git a/www/posts/2019/09/version-1-6-6-released.md b/www/posts/2019/09/version-1-6-6-released.md
index 8a3325c4bb..7432b2906d 100644
--- a/www/posts/2019/09/version-1-6-6-released.md
+++ b/www/posts/2019/09/version-1-6-6-released.md
@@ -59,5 +59,5 @@ The complete list of fixes addressed in version 1.6.6 is:
 
 [CVE-2019-11778]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11778
 [CVE-2019-11779]: http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-11779
-[#1412]: https://github.com/eclipse/mosquitto/issues/1412
-[#1414]: https://github.com/eclipse/mosquitto/issues/1414
+[#1412]: https://github.com/eclipse-mosquitto/mosquitto/issues/1412
+[#1414]: https://github.com/eclipse-mosquitto/mosquitto/issues/1414
diff --git a/www/posts/2019/09/version-1-6-7-released.md b/www/posts/2019/09/version-1-6-7-released.md
index 6ebf9ba507..bdb3b63dce 100644
--- a/www/posts/2019/09/version-1-6-7-released.md
+++ b/www/posts/2019/09/version-1-6-7-released.md
@@ -27,9 +27,9 @@ Mosquitto 1.6.7 has been released, this is a bugfix release.
   specified. [Closes #1418].
 - Updated documentation around automatic client ids.
 
-[#1415]: https://github.com/eclipse/mosquitto/issues/1415
-[#1417]: https://github.com/eclipse/mosquitto/issues/1417
-[#1418]: https://github.com/eclipse/mosquitto/issues/1418
-[#1422]: https://github.com/eclipse/mosquitto/issues/1422
-[#1424]: https://github.com/eclipse/mosquitto/issues/1424
-[#1425]: https://github.com/eclipse/mosquitto/issues/1425
+[#1415]: https://github.com/eclipse-mosquitto/mosquitto/issues/1415
+[#1417]: https://github.com/eclipse-mosquitto/mosquitto/issues/1417
+[#1418]: https://github.com/eclipse-mosquitto/mosquitto/issues/1418
+[#1422]: https://github.com/eclipse-mosquitto/mosquitto/issues/1422
+[#1424]: https://github.com/eclipse-mosquitto/mosquitto/issues/1424
+[#1425]: https://github.com/eclipse-mosquitto/mosquitto/issues/1425
diff --git a/www/posts/2019/11/version-1-6-8-released.md b/www/posts/2019/11/version-1-6-8-released.md
index 657f1d6a6c..f0f232c321 100644
--- a/www/posts/2019/11/version-1-6-8-released.md
+++ b/www/posts/2019/11/version-1-6-8-released.md
@@ -56,20 +56,20 @@ Mosquitto 1.6.8 has been released, this is a bugfix release.
 # Installer
 - Fix `mosquitto_rr.exe` not being included in Windows installers. Closes [#1463].
 
-[#1429]: https://github.com/eclipse/mosquitto/issues/1429
-[#1432]: https://github.com/eclipse/mosquitto/issues/1432
-[#1437]: https://github.com/eclipse/mosquitto/issues/1437
-[#1441]: https://github.com/eclipse/mosquitto/issues/1441
-[#1442]: https://github.com/eclipse/mosquitto/issues/1442
-[#1448]: https://github.com/eclipse/mosquitto/issues/1448
-[#1453]: https://github.com/eclipse/mosquitto/issues/1453
-[#1459]: https://github.com/eclipse/mosquitto/issues/1459
-[#1463]: https://github.com/eclipse/mosquitto/issues/1463
-[#1464]: https://github.com/eclipse/mosquitto/issues/1464
-[#1473]: https://github.com/eclipse/mosquitto/issues/1473
-[#1474]: https://github.com/eclipse/mosquitto/issues/1474
-[#1478]: https://github.com/eclipse/mosquitto/issues/1478
-[#1489]: https://github.com/eclipse/mosquitto/issues/1489
-[#1494]: https://github.com/eclipse/mosquitto/issues/1494
-[#1499]: https://github.com/eclipse/mosquitto/issues/1499
-[#1513]: https://github.com/eclipse/mosquitto/issues/1513
+[#1429]: https://github.com/eclipse-mosquitto/mosquitto/issues/1429
+[#1432]: https://github.com/eclipse-mosquitto/mosquitto/issues/1432
+[#1437]: https://github.com/eclipse-mosquitto/mosquitto/issues/1437
+[#1441]: https://github.com/eclipse-mosquitto/mosquitto/issues/1441
+[#1442]: https://github.com/eclipse-mosquitto/mosquitto/issues/1442
+[#1448]: https://github.com/eclipse-mosquitto/mosquitto/issues/1448
+[#1453]: https://github.com/eclipse-mosquitto/mosquitto/issues/1453
+[#1459]: https://github.com/eclipse-mosquitto/mosquitto/issues/1459
+[#1463]: https://github.com/eclipse-mosquitto/mosquitto/issues/1463
+[#1464]: https://github.com/eclipse-mosquitto/mosquitto/issues/1464
+[#1473]: https://github.com/eclipse-mosquitto/mosquitto/issues/1473
+[#1474]: https://github.com/eclipse-mosquitto/mosquitto/issues/1474
+[#1478]: https://github.com/eclipse-mosquitto/mosquitto/issues/1478
+[#1489]: https://github.com/eclipse-mosquitto/mosquitto/issues/1489
+[#1494]: https://github.com/eclipse-mosquitto/mosquitto/issues/1494
+[#1499]: https://github.com/eclipse-mosquitto/mosquitto/issues/1499
+[#1513]: https://github.com/eclipse-mosquitto/mosquitto/issues/1513
diff --git a/www/posts/2020/02/version-1-6-9-released.md b/www/posts/2020/02/version-1-6-9-released.md
index c26d9d9bfd..b1894fc45d 100644
--- a/www/posts/2020/02/version-1-6-9-released.md
+++ b/www/posts/2020/02/version-1-6-9-released.md
@@ -40,17 +40,17 @@ Mosquitto 1.6.9 has been released, this is a bugfix release.
 - Default behaviour for v5 clients using `-c` is now to use infinite length
   sessions, as with v3 clients. Closes [#1546].
 
-[#1525]: https://github.com/eclipse/mosquitto/issues/1525
-[#1533]: https://github.com/eclipse/mosquitto/issues/1533
-[#1539]: https://github.com/eclipse/mosquitto/issues/1539
-[#1539]: https://github.com/eclipse/mosquitto/issues/1539
-[#1545]: https://github.com/eclipse/mosquitto/issues/1545
-[#1546]: https://github.com/eclipse/mosquitto/issues/1546
-[#1550]: https://github.com/eclipse/mosquitto/issues/1550
-[#1552]: https://github.com/eclipse/mosquitto/issues/1552
-[#1564]: https://github.com/eclipse/mosquitto/issues/1564
-[#1565]: https://github.com/eclipse/mosquitto/issues/1565
-[#1566]: https://github.com/eclipse/mosquitto/issues/1566
-[#1584]: https://github.com/eclipse/mosquitto/issues/1584
-[#1585]: https://github.com/eclipse/mosquitto/issues/1585
-[#1589]: https://github.com/eclipse/mosquitto/issues/1589
+[#1525]: https://github.com/eclipse-mosquitto/mosquitto/issues/1525
+[#1533]: https://github.com/eclipse-mosquitto/mosquitto/issues/1533
+[#1539]: https://github.com/eclipse-mosquitto/mosquitto/issues/1539
+[#1539]: https://github.com/eclipse-mosquitto/mosquitto/issues/1539
+[#1545]: https://github.com/eclipse-mosquitto/mosquitto/issues/1545
+[#1546]: https://github.com/eclipse-mosquitto/mosquitto/issues/1546
+[#1550]: https://github.com/eclipse-mosquitto/mosquitto/issues/1550
+[#1552]: https://github.com/eclipse-mosquitto/mosquitto/issues/1552
+[#1564]: https://github.com/eclipse-mosquitto/mosquitto/issues/1564
+[#1565]: https://github.com/eclipse-mosquitto/mosquitto/issues/1565
+[#1566]: https://github.com/eclipse-mosquitto/mosquitto/issues/1566
+[#1584]: https://github.com/eclipse-mosquitto/mosquitto/issues/1584
+[#1585]: https://github.com/eclipse-mosquitto/mosquitto/issues/1585
+[#1589]: https://github.com/eclipse-mosquitto/mosquitto/issues/1589
diff --git a/www/posts/2020/05/version-1-6-10-released.md b/www/posts/2020/05/version-1-6-10-released.md
index 0ac4d00ced..84e5f40aca 100644
--- a/www/posts/2020/05/version-1-6-10-released.md
+++ b/www/posts/2020/05/version-1-6-10-released.md
@@ -42,14 +42,14 @@ Mosquitto 1.6.10 has been released, this is a bugfix release.
 - Various fixes for building with below C99 support. Closes [#1622].
 - Fix use of sed on BSD. Closes [#1614].
 
-[#1521]: https://github.com/eclipse/mosquitto/issues/1521
-[#1614]: https://github.com/eclipse/mosquitto/issues/1614
-[#1622]: https://github.com/eclipse/mosquitto/issues/1622
-[#1629]: https://github.com/eclipse/mosquitto/issues/1629
-[#1635]: https://github.com/eclipse/mosquitto/issues/1635
-[#1664]: https://github.com/eclipse/mosquitto/issues/1664
-[#1674]: https://github.com/eclipse/mosquitto/issues/1674
-[#1684]: https://github.com/eclipse/mosquitto/issues/1684
-[#1690]: https://github.com/eclipse/mosquitto/issues/1690
-[#1691]: https://github.com/eclipse/mosquitto/issues/1691
-[#1700]: https://github.com/eclipse/mosquitto/issues/1700
+[#1521]: https://github.com/eclipse-mosquitto/mosquitto/issues/1521
+[#1614]: https://github.com/eclipse-mosquitto/mosquitto/issues/1614
+[#1622]: https://github.com/eclipse-mosquitto/mosquitto/issues/1622
+[#1629]: https://github.com/eclipse-mosquitto/mosquitto/issues/1629
+[#1635]: https://github.com/eclipse-mosquitto/mosquitto/issues/1635
+[#1664]: https://github.com/eclipse-mosquitto/mosquitto/issues/1664
+[#1674]: https://github.com/eclipse-mosquitto/mosquitto/issues/1674
+[#1684]: https://github.com/eclipse-mosquitto/mosquitto/issues/1684
+[#1690]: https://github.com/eclipse-mosquitto/mosquitto/issues/1690
+[#1691]: https://github.com/eclipse-mosquitto/mosquitto/issues/1691
+[#1700]: https://github.com/eclipse-mosquitto/mosquitto/issues/1700
diff --git a/www/posts/2020/08/version-1-6-11-released.md b/www/posts/2020/08/version-1-6-11-released.md
index 8298393de1..50c2b34622 100644
--- a/www/posts/2020/08/version-1-6-11-released.md
+++ b/www/posts/2020/08/version-1-6-11-released.md
@@ -50,23 +50,23 @@ Mosquitto 1.6.11 has been released, this is a bugfix release.
 - Fix `mosquitto_loop_stop()` not stopping on Windows. Closes [#1748]. Closes [#117].
 
 
-[#117]: https://github.com/eclipse/mosquitto/issues/117
-[#821]: https://github.com/eclipse/mosquitto/issues/821
-[#1547]: https://github.com/eclipse/mosquitto/issues/1547
-[#1689]: https://github.com/eclipse/mosquitto/issues/1689
-[#1713]: https://github.com/eclipse/mosquitto/issues/1713
-[#1718]: https://github.com/eclipse/mosquitto/issues/1718
-[#1725]: https://github.com/eclipse/mosquitto/issues/1725
-[#1726]: https://github.com/eclipse/mosquitto/issues/1726
-[#1729]: https://github.com/eclipse/mosquitto/issues/1729
-[#1730]: https://github.com/eclipse/mosquitto/issues/1730
-[#1735]: https://github.com/eclipse/mosquitto/issues/1735
-[#1740]: https://github.com/eclipse/mosquitto/issues/1740
-[#1741]: https://github.com/eclipse/mosquitto/issues/1741
-[#1748]: https://github.com/eclipse/mosquitto/issues/1748
-[#1749]: https://github.com/eclipse/mosquitto/issues/1749
-[#1752]: https://github.com/eclipse/mosquitto/issues/1752
-[#1773]: https://github.com/eclipse/mosquitto/issues/1773
-[#1774]: https://github.com/eclipse/mosquitto/issues/1774
-[#1777]: https://github.com/eclipse/mosquitto/issues/1777
+[#117]: https://github.com/eclipse-mosquitto/mosquitto/issues/117
+[#821]: https://github.com/eclipse-mosquitto/mosquitto/issues/821
+[#1547]: https://github.com/eclipse-mosquitto/mosquitto/issues/1547
+[#1689]: https://github.com/eclipse-mosquitto/mosquitto/issues/1689
+[#1713]: https://github.com/eclipse-mosquitto/mosquitto/issues/1713
+[#1718]: https://github.com/eclipse-mosquitto/mosquitto/issues/1718
+[#1725]: https://github.com/eclipse-mosquitto/mosquitto/issues/1725
+[#1726]: https://github.com/eclipse-mosquitto/mosquitto/issues/1726
+[#1729]: https://github.com/eclipse-mosquitto/mosquitto/issues/1729
+[#1730]: https://github.com/eclipse-mosquitto/mosquitto/issues/1730
+[#1735]: https://github.com/eclipse-mosquitto/mosquitto/issues/1735
+[#1740]: https://github.com/eclipse-mosquitto/mosquitto/issues/1740
+[#1741]: https://github.com/eclipse-mosquitto/mosquitto/issues/1741
+[#1748]: https://github.com/eclipse-mosquitto/mosquitto/issues/1748
+[#1749]: https://github.com/eclipse-mosquitto/mosquitto/issues/1749
+[#1752]: https://github.com/eclipse-mosquitto/mosquitto/issues/1752
+[#1773]: https://github.com/eclipse-mosquitto/mosquitto/issues/1773
+[#1774]: https://github.com/eclipse-mosquitto/mosquitto/issues/1774
+[#1777]: https://github.com/eclipse-mosquitto/mosquitto/issues/1777
 [#565671]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=565671
diff --git a/www/posts/2020/08/version-1-6-12-released.md b/www/posts/2020/08/version-1-6-12-released.md
index 6cb5205ab1..0b1ed81314 100644
--- a/www/posts/2020/08/version-1-6-12-released.md
+++ b/www/posts/2020/08/version-1-6-12-released.md
@@ -30,5 +30,5 @@ The following fixes apply to 1.6.12 only.
 - All clients exit with an error exit code on CONNACK failure. Closes [#1778].
 - Don't busy loop with `mosquitto_pub -l` on a slow connection.
 
-[#1778]: https://github.com/eclipse/mosquitto/issues/1778
-[#1793]: https://github.com/eclipse/mosquitto/issues/1793
+[#1778]: https://github.com/eclipse-mosquitto/mosquitto/issues/1778
+[#1793]: https://github.com/eclipse-mosquitto/mosquitto/issues/1793
diff --git a/www/posts/2020/12/version-2-0-0-released.md b/www/posts/2020/12/version-2-0-0-released.md
index 7bc1ec118a..3c5b1a0354 100644
--- a/www/posts/2020/12/version-2-0-0-released.md
+++ b/www/posts/2020/12/version-2-0-0-released.md
@@ -221,31 +221,31 @@ overall behaviour of a topic without having to see every message, for example.
   Windows, rather than just quitting. Closes [#1908].
 
 [migrating from 1.x to 2.0]:/documentation/migrating-to-2-0/
-[#265]: https://github.com/eclipse/mosquitto/issues/265
-[#275]: https://github.com/eclipse/mosquitto/issues/275
-[#291]: https://github.com/eclipse/mosquitto/issues/291
-[#1222]: https://github.com/eclipse/mosquitto/issues/1222
-[#1258]: https://github.com/eclipse/mosquitto/issues/1258
-[#1311]: https://github.com/eclipse/mosquitto/issues/1311
-[#1416]: https://github.com/eclipse/mosquitto/issues/1416
-[#1526]: https://github.com/eclipse/mosquitto/issues/1526
-[#1611]: https://github.com/eclipse/mosquitto/issues/1611
-[#1735]: https://github.com/eclipse/mosquitto/issues/1735
-[#1814]: https://github.com/eclipse/mosquitto/issues/1814
-[#1819]: https://github.com/eclipse/mosquitto/issues/1819
-[#1822]: https://github.com/eclipse/mosquitto/issues/1822
-[#1824]: https://github.com/eclipse/mosquitto/issues/1824
-[#1825]: https://github.com/eclipse/mosquitto/issues/1825
-[#1831]: https://github.com/eclipse/mosquitto/issues/1831
-[#1833]: https://github.com/eclipse/mosquitto/issues/1833
-[#1842]: https://github.com/eclipse/mosquitto/issues/1842
-[#1846]: https://github.com/eclipse/mosquitto/issues/1846
-[#1862]: https://github.com/eclipse/mosquitto/issues/1862
-[#1866]: https://github.com/eclipse/mosquitto/issues/1866
-[#1880]: https://github.com/eclipse/mosquitto/issues/1880
-[#1881]: https://github.com/eclipse/mosquitto/issues/1881
-[#1891]: https://github.com/eclipse/mosquitto/issues/1891
-[#1897]: https://github.com/eclipse/mosquitto/issues/1897
-[#1902]: https://github.com/eclipse/mosquitto/issues/1902
-[#1908]: https://github.com/eclipse/mosquitto/issues/1908
-[#1911]: https://github.com/eclipse/mosquitto/issues/1911
+[#265]: https://github.com/eclipse-mosquitto/mosquitto/issues/265
+[#275]: https://github.com/eclipse-mosquitto/mosquitto/issues/275
+[#291]: https://github.com/eclipse-mosquitto/mosquitto/issues/291
+[#1222]: https://github.com/eclipse-mosquitto/mosquitto/issues/1222
+[#1258]: https://github.com/eclipse-mosquitto/mosquitto/issues/1258
+[#1311]: https://github.com/eclipse-mosquitto/mosquitto/issues/1311
+[#1416]: https://github.com/eclipse-mosquitto/mosquitto/issues/1416
+[#1526]: https://github.com/eclipse-mosquitto/mosquitto/issues/1526
+[#1611]: https://github.com/eclipse-mosquitto/mosquitto/issues/1611
+[#1735]: https://github.com/eclipse-mosquitto/mosquitto/issues/1735
+[#1814]: https://github.com/eclipse-mosquitto/mosquitto/issues/1814
+[#1819]: https://github.com/eclipse-mosquitto/mosquitto/issues/1819
+[#1822]: https://github.com/eclipse-mosquitto/mosquitto/issues/1822
+[#1824]: https://github.com/eclipse-mosquitto/mosquitto/issues/1824
+[#1825]: https://github.com/eclipse-mosquitto/mosquitto/issues/1825
+[#1831]: https://github.com/eclipse-mosquitto/mosquitto/issues/1831
+[#1833]: https://github.com/eclipse-mosquitto/mosquitto/issues/1833
+[#1842]: https://github.com/eclipse-mosquitto/mosquitto/issues/1842
+[#1846]: https://github.com/eclipse-mosquitto/mosquitto/issues/1846
+[#1862]: https://github.com/eclipse-mosquitto/mosquitto/issues/1862
+[#1866]: https://github.com/eclipse-mosquitto/mosquitto/issues/1866
+[#1880]: https://github.com/eclipse-mosquitto/mosquitto/issues/1880
+[#1881]: https://github.com/eclipse-mosquitto/mosquitto/issues/1881
+[#1891]: https://github.com/eclipse-mosquitto/mosquitto/issues/1891
+[#1897]: https://github.com/eclipse-mosquitto/mosquitto/issues/1897
+[#1902]: https://github.com/eclipse-mosquitto/mosquitto/issues/1902
+[#1908]: https://github.com/eclipse-mosquitto/mosquitto/issues/1908
+[#1911]: https://github.com/eclipse-mosquitto/mosquitto/issues/1911
diff --git a/www/posts/2020/12/version-2-0-2-released.md b/www/posts/2020/12/version-2-0-2-released.md
index b5b8c07118..6d33cfab5b 100644
--- a/www/posts/2020/12/version-2-0-2-released.md
+++ b/www/posts/2020/12/version-2-0-2-released.md
@@ -37,7 +37,7 @@ The 2.0.1 changes are below.
 - Distribute cmake/ and snap/ directories in tar.
 
 
-[#1476]: https://github.com/eclipse/mosquitto/issues/1476
-[#1925]: https://github.com/eclipse/mosquitto/issues/1925
-[#1934]: https://github.com/eclipse/mosquitto/issues/1934
-[#1936]: https://github.com/eclipse/mosquitto/issues/1936
+[#1476]: https://github.com/eclipse-mosquitto/mosquitto/issues/1476
+[#1925]: https://github.com/eclipse-mosquitto/mosquitto/issues/1925
+[#1934]: https://github.com/eclipse-mosquitto/mosquitto/issues/1934
+[#1936]: https://github.com/eclipse-mosquitto/mosquitto/issues/1936
diff --git a/www/posts/2020/12/version-2-0-3-released.md b/www/posts/2020/12/version-2-0-3-released.md
index aed11166a4..7fb739fb0d 100644
--- a/www/posts/2020/12/version-2-0-3-released.md
+++ b/www/posts/2020/12/version-2-0-3-released.md
@@ -40,12 +40,12 @@ Version 2.0.3 of Mosquitto has been released. This is a bugfix release.
 - Fix `install` target when using WITH_CJSON=no. Closes [#1938].
 - Fix `generic` docker build. Closes [#1945].
 
-[#1938]: https://github.com/eclipse/mosquitto/issues/1938
-[#1942]: https://github.com/eclipse/mosquitto/issues/1942
-[#1945]: https://github.com/eclipse/mosquitto/issues/1945
-[#1946]: https://github.com/eclipse/mosquitto/issues/1946
-[#1947]: https://github.com/eclipse/mosquitto/issues/1947
-[#1949]: https://github.com/eclipse/mosquitto/issues/1949
-[#1956]: https://github.com/eclipse/mosquitto/issues/1956
-[#1957]: https://github.com/eclipse/mosquitto/issues/1957
-[#1960]: https://github.com/eclipse/mosquitto/issues/1960
+[#1938]: https://github.com/eclipse-mosquitto/mosquitto/issues/1938
+[#1942]: https://github.com/eclipse-mosquitto/mosquitto/issues/1942
+[#1945]: https://github.com/eclipse-mosquitto/mosquitto/issues/1945
+[#1946]: https://github.com/eclipse-mosquitto/mosquitto/issues/1946
+[#1947]: https://github.com/eclipse-mosquitto/mosquitto/issues/1947
+[#1949]: https://github.com/eclipse-mosquitto/mosquitto/issues/1949
+[#1956]: https://github.com/eclipse-mosquitto/mosquitto/issues/1956
+[#1957]: https://github.com/eclipse-mosquitto/mosquitto/issues/1957
+[#1960]: https://github.com/eclipse-mosquitto/mosquitto/issues/1960
diff --git a/www/posts/2020/12/version-2-0-4-released.md b/www/posts/2020/12/version-2-0-4-released.md
index 9cb2686ea9..142bd75b35 100644
--- a/www/posts/2020/12/version-2-0-4-released.md
+++ b/www/posts/2020/12/version-2-0-4-released.md
@@ -25,7 +25,7 @@ Version 2.0.4 of Mosquitto has been released. This is a bugfix release.
 # Build
 - Fix man pages not being built when using CMake. Closes [#1969].
 
-[#1934]: https://github.com/eclipse/mosquitto/issues/1934
-[#1962]: https://github.com/eclipse/mosquitto/issues/1962
-[#1968]: https://github.com/eclipse/mosquitto/issues/1968
-[#1969]: https://github.com/eclipse/mosquitto/issues/1969
+[#1934]: https://github.com/eclipse-mosquitto/mosquitto/issues/1934
+[#1962]: https://github.com/eclipse-mosquitto/mosquitto/issues/1962
+[#1968]: https://github.com/eclipse-mosquitto/mosquitto/issues/1968
+[#1969]: https://github.com/eclipse-mosquitto/mosquitto/issues/1969
diff --git a/www/posts/2021/01/version-2-0-5-released.md b/www/posts/2021/01/version-2-0-5-released.md
index a94cb0c16f..d2074a6fdc 100644
--- a/www/posts/2021/01/version-2-0-5-released.md
+++ b/www/posts/2021/01/version-2-0-5-released.md
@@ -43,14 +43,14 @@ Version 2.0.5 of Mosquitto has been released. This is a bugfix release.
 - Fix `mosquitto_ctrl dynsec getGroup` not showing roles. Closes [#1997].
 
 
-[#1975]: https://github.com/eclipse/mosquitto/issues/1975
-[#1977]: https://github.com/eclipse/mosquitto/issues/1977
-[#1978]: https://github.com/eclipse/mosquitto/issues/1978
-[#1979]: https://github.com/eclipse/mosquitto/issues/1979
-[#1989]: https://github.com/eclipse/mosquitto/issues/1989
-[#1995]: https://github.com/eclipse/mosquitto/issues/1995
-[#1997]: https://github.com/eclipse/mosquitto/issues/1997
-[#1998]: https://github.com/eclipse/mosquitto/issues/1998
-[#1999]: https://github.com/eclipse/mosquitto/issues/1999
-[#2005]: https://github.com/eclipse/mosquitto/issues/2005
-[#2008]: https://github.com/eclipse/mosquitto/issues/2008
+[#1975]: https://github.com/eclipse-mosquitto/mosquitto/issues/1975
+[#1977]: https://github.com/eclipse-mosquitto/mosquitto/issues/1977
+[#1978]: https://github.com/eclipse-mosquitto/mosquitto/issues/1978
+[#1979]: https://github.com/eclipse-mosquitto/mosquitto/issues/1979
+[#1989]: https://github.com/eclipse-mosquitto/mosquitto/issues/1989
+[#1995]: https://github.com/eclipse-mosquitto/mosquitto/issues/1995
+[#1997]: https://github.com/eclipse-mosquitto/mosquitto/issues/1997
+[#1998]: https://github.com/eclipse-mosquitto/mosquitto/issues/1998
+[#1999]: https://github.com/eclipse-mosquitto/mosquitto/issues/1999
+[#2005]: https://github.com/eclipse-mosquitto/mosquitto/issues/2005
+[#2008]: https://github.com/eclipse-mosquitto/mosquitto/issues/2008
diff --git a/www/posts/2021/01/version-2-0-6-released.md b/www/posts/2021/01/version-2-0-6-released.md
index d83c212ce4..1dc9c0e46a 100644
--- a/www/posts/2021/01/version-2-0-6-released.md
+++ b/www/posts/2021/01/version-2-0-6-released.md
@@ -46,14 +46,14 @@ Version 2.0.6 of Mosquitto has been released. This is a bugfix release.
 - The SPDX identifiers for EDL-1.0 have been changed to BSD-3-Clause as per
   The Eclipse legal documentation generator. The licenses are identical.
 
-[#1974]: https://github.com/eclipse/mosquitto/issues/1974
-[#2010]: https://github.com/eclipse/mosquitto/issues/2010
-[#2011]: https://github.com/eclipse/mosquitto/issues/2011
-[#2017]: https://github.com/eclipse/mosquitto/issues/2017
-[#2019]: https://github.com/eclipse/mosquitto/issues/2019
-[#2020]: https://github.com/eclipse/mosquitto/issues/2020
-[#2022]: https://github.com/eclipse/mosquitto/issues/2022
-[#2026]: https://github.com/eclipse/mosquitto/issues/2026
-[#2029]: https://github.com/eclipse/mosquitto/issues/2029
-[#2037]: https://github.com/eclipse/mosquitto/issues/2037
-[#2043]: https://github.com/eclipse/mosquitto/issues/2043
+[#1974]: https://github.com/eclipse-mosquitto/mosquitto/issues/1974
+[#2010]: https://github.com/eclipse-mosquitto/mosquitto/issues/2010
+[#2011]: https://github.com/eclipse-mosquitto/mosquitto/issues/2011
+[#2017]: https://github.com/eclipse-mosquitto/mosquitto/issues/2017
+[#2019]: https://github.com/eclipse-mosquitto/mosquitto/issues/2019
+[#2020]: https://github.com/eclipse-mosquitto/mosquitto/issues/2020
+[#2022]: https://github.com/eclipse-mosquitto/mosquitto/issues/2022
+[#2026]: https://github.com/eclipse-mosquitto/mosquitto/issues/2026
+[#2029]: https://github.com/eclipse-mosquitto/mosquitto/issues/2029
+[#2037]: https://github.com/eclipse-mosquitto/mosquitto/issues/2037
+[#2043]: https://github.com/eclipse-mosquitto/mosquitto/issues/2043
diff --git a/www/posts/2021/02/version-2-0-7-released.md b/www/posts/2021/02/version-2-0-7-released.md
index 4e9190c776..74de690580 100644
--- a/www/posts/2021/02/version-2-0-7-released.md
+++ b/www/posts/2021/02/version-2-0-7-released.md
@@ -61,17 +61,17 @@ Version 2.0.7 and 1.6.13 of Mosquitto have been released. These are bugfix relea
 ## Build:
 - Enable epoll support in CMake builds.
 
-[#1476]: https://github.com/eclipse/mosquitto/issues/1476
-[#1866]: https://github.com/eclipse/mosquitto/issues/1866
-[#1880]: https://github.com/eclipse/mosquitto/issues/1880
-[#1891]: https://github.com/eclipse/mosquitto/issues/1891
-[#1897]: https://github.com/eclipse/mosquitto/issues/1897
-[#1905]: https://github.com/eclipse/mosquitto/issues/1905
-[#1908]: https://github.com/eclipse/mosquitto/issues/1908
-[#1925]: https://github.com/eclipse/mosquitto/issues/1925
-[#1942]: https://github.com/eclipse/mosquitto/issues/1942
-[#1968]: https://github.com/eclipse/mosquitto/issues/1968
-[#2057]: https://github.com/eclipse/mosquitto/issues/2057
-[#2059]: https://github.com/eclipse/mosquitto/issues/2059
-[#2066]: https://github.com/eclipse/mosquitto/issues/2066
+[#1476]: https://github.com/eclipse-mosquitto/mosquitto/issues/1476
+[#1866]: https://github.com/eclipse-mosquitto/mosquitto/issues/1866
+[#1880]: https://github.com/eclipse-mosquitto/mosquitto/issues/1880
+[#1891]: https://github.com/eclipse-mosquitto/mosquitto/issues/1891
+[#1897]: https://github.com/eclipse-mosquitto/mosquitto/issues/1897
+[#1905]: https://github.com/eclipse-mosquitto/mosquitto/issues/1905
+[#1908]: https://github.com/eclipse-mosquitto/mosquitto/issues/1908
+[#1925]: https://github.com/eclipse-mosquitto/mosquitto/issues/1925
+[#1942]: https://github.com/eclipse-mosquitto/mosquitto/issues/1942
+[#1968]: https://github.com/eclipse-mosquitto/mosquitto/issues/1968
+[#2057]: https://github.com/eclipse-mosquitto/mosquitto/issues/2057
+[#2059]: https://github.com/eclipse-mosquitto/mosquitto/issues/2059
+[#2066]: https://github.com/eclipse-mosquitto/mosquitto/issues/2066
 [#570126]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=570126
diff --git a/www/posts/2021/02/version-2-0-8-released.md b/www/posts/2021/02/version-2-0-8-released.md
index cedb9ddbd7..969415f1a2 100644
--- a/www/posts/2021/02/version-2-0-8-released.md
+++ b/www/posts/2021/02/version-2-0-8-released.md
@@ -36,7 +36,7 @@ Version 2.0.8 of Mosquitto has been released. This is a bugfix release.
   authentication, without having to provide their own configuration file.
   Closes [#2040].
 
-[#2040]: https://github.com/eclipse/mosquitto/issues/2040
-[#2060]: https://github.com/eclipse/mosquitto/issues/2060
-[#2078]: https://github.com/eclipse/mosquitto/issues/2078
-[#2096]: https://github.com/eclipse/mosquitto/issues/2096
+[#2040]: https://github.com/eclipse-mosquitto/mosquitto/issues/2040
+[#2060]: https://github.com/eclipse-mosquitto/mosquitto/issues/2060
+[#2078]: https://github.com/eclipse-mosquitto/mosquitto/issues/2078
+[#2096]: https://github.com/eclipse-mosquitto/mosquitto/issues/2096
diff --git a/www/posts/2021/03/version-2-0-9-released.md b/www/posts/2021/03/version-2-0-9-released.md
index 8300346cba..44e8555321 100644
--- a/www/posts/2021/03/version-2-0-9-released.md
+++ b/www/posts/2021/03/version-2-0-9-released.md
@@ -91,11 +91,11 @@ bugfix releases and include a minor security fix.
 - Fix encrypted connections incorrectly connecting when the CA file passed to
   `mosquitto_tls_set()` is empty or invalid. Closes [#2130].
 
-[#2040]: https://github.com/eclipse/mosquitto/issues/2040
-[#2078]: https://github.com/eclipse/mosquitto/issues/2078
-[#2081]: https://github.com/eclipse/mosquitto/issues/2081
-[#2110]: https://github.com/eclipse/mosquitto/issues/2110
-[#2111]: https://github.com/eclipse/mosquitto/issues/2111
-[#2117]: https://github.com/eclipse/mosquitto/issues/2117
-[#2123]: https://github.com/eclipse/mosquitto/issues/2123
-[#2130]: https://github.com/eclipse/mosquitto/issues/2130
+[#2040]: https://github.com/eclipse-mosquitto/mosquitto/issues/2040
+[#2078]: https://github.com/eclipse-mosquitto/mosquitto/issues/2078
+[#2081]: https://github.com/eclipse-mosquitto/mosquitto/issues/2081
+[#2110]: https://github.com/eclipse-mosquitto/mosquitto/issues/2110
+[#2111]: https://github.com/eclipse-mosquitto/mosquitto/issues/2111
+[#2117]: https://github.com/eclipse-mosquitto/mosquitto/issues/2117
+[#2123]: https://github.com/eclipse-mosquitto/mosquitto/issues/2123
+[#2130]: https://github.com/eclipse-mosquitto/mosquitto/issues/2130
diff --git a/www/posts/2021/04/version-2-0-10-released.md b/www/posts/2021/04/version-2-0-10-released.md
index 096dc7ab44..52f77f0bd8 100644
--- a/www/posts/2021/04/version-2-0-10-released.md
+++ b/www/posts/2021/04/version-2-0-10-released.md
@@ -42,8 +42,8 @@ release.
 - Fix build on Solaris non-sparc. Closes [#2136].
 
 [CVE-2021-23980]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-28166
-[#2134]: https://github.com/eclipse/mosquitto/issues/2134
-[#2136]: https://github.com/eclipse/mosquitto/issues/2136
-[#2152]: https://github.com/eclipse/mosquitto/issues/2152
-[#2160]: https://github.com/eclipse/mosquitto/issues/2160
-[#2163]: https://github.com/eclipse/mosquitto/issues/2163
+[#2134]: https://github.com/eclipse-mosquitto/mosquitto/issues/2134
+[#2136]: https://github.com/eclipse-mosquitto/mosquitto/issues/2136
+[#2152]: https://github.com/eclipse-mosquitto/mosquitto/issues/2152
+[#2160]: https://github.com/eclipse-mosquitto/mosquitto/issues/2160
+[#2163]: https://github.com/eclipse-mosquitto/mosquitto/issues/2163
diff --git a/www/posts/2021/06/version-2-0-11-released.md b/www/posts/2021/06/version-2-0-11-released.md
index 555ec46507..0ae78fd2d2 100644
--- a/www/posts/2021/06/version-2-0-11-released.md
+++ b/www/posts/2021/06/version-2-0-11-released.md
@@ -45,10 +45,10 @@ and bugfix releases.
   message to the broker a memory leak would occur.
   Affects versions 1.6 to 2.0.10 inclusive.
 
-[#2164]: https://github.com/eclipse/mosquitto/issues/2164
-[#2167]: https://github.com/eclipse/mosquitto/issues/2167
-[#2172]: https://github.com/eclipse/mosquitto/issues/2172
-[#2173]: https://github.com/eclipse/mosquitto/issues/2173
-[#2187]: https://github.com/eclipse/mosquitto/issues/2187
-[#2207]: https://github.com/eclipse/mosquitto/issues/2207
-[#2224]: https://github.com/eclipse/mosquitto/issues/2224
+[#2164]: https://github.com/eclipse-mosquitto/mosquitto/issues/2164
+[#2167]: https://github.com/eclipse-mosquitto/mosquitto/issues/2167
+[#2172]: https://github.com/eclipse-mosquitto/mosquitto/issues/2172
+[#2173]: https://github.com/eclipse-mosquitto/mosquitto/issues/2173
+[#2187]: https://github.com/eclipse-mosquitto/mosquitto/issues/2187
+[#2207]: https://github.com/eclipse-mosquitto/mosquitto/issues/2207
+[#2224]: https://github.com/eclipse-mosquitto/mosquitto/issues/2224
diff --git a/www/posts/2021/08/version-2-0-12-released.md b/www/posts/2021/08/version-2-0-12-released.md
index 2c14e95a42..a5843f168d 100644
--- a/www/posts/2021/08/version-2-0-12-released.md
+++ b/www/posts/2021/08/version-2-0-12-released.md
@@ -82,15 +82,15 @@ and bugfix release.
 - Remove some unnecessary code guards related to libressl.
 - Fix printf format build warning on MIPS. Closes [#2271].
 
-[#2198]: https://github.com/eclipse/mosquitto/issues/2198
-[#2241]: https://github.com/eclipse/mosquitto/issues/2241
-[#2242]: https://github.com/eclipse/mosquitto/issues/2242
-[#2244]: https://github.com/eclipse/mosquitto/issues/2244
-[#2271]: https://github.com/eclipse/mosquitto/issues/2271
-[#2281]: https://github.com/eclipse/mosquitto/issues/2281
-[#2286]: https://github.com/eclipse/mosquitto/issues/2286
-[#2288]: https://github.com/eclipse/mosquitto/issues/2288
-[#2289]: https://github.com/eclipse/mosquitto/issues/2289
+[#2198]: https://github.com/eclipse-mosquitto/mosquitto/issues/2198
+[#2241]: https://github.com/eclipse-mosquitto/mosquitto/issues/2241
+[#2242]: https://github.com/eclipse-mosquitto/mosquitto/issues/2242
+[#2244]: https://github.com/eclipse-mosquitto/mosquitto/issues/2244
+[#2271]: https://github.com/eclipse-mosquitto/mosquitto/issues/2271
+[#2281]: https://github.com/eclipse-mosquitto/mosquitto/issues/2281
+[#2286]: https://github.com/eclipse-mosquitto/mosquitto/issues/2286
+[#2288]: https://github.com/eclipse-mosquitto/mosquitto/issues/2288
+[#2289]: https://github.com/eclipse-mosquitto/mosquitto/issues/2289
 [#567213]: https://bugs.eclipse.org/bugs/show_bug.cgi?id=567213
 [CVE-2020-13849]: https://nvd.nist.gov/vuln/detail/CVE-2020-13849
 [CVE-2021-34434]: https://nvd.nist.gov/vuln/detail/CVE-2021-34434
diff --git a/www/posts/2021/10/version-2-0-13-released.md b/www/posts/2021/10/version-2-0-13-released.md
index 6ed98da338..fe621a772c 100644
--- a/www/posts/2021/10/version-2-0-13-released.md
+++ b/www/posts/2021/10/version-2-0-13-released.md
@@ -31,10 +31,10 @@ Version 2.0.13 of Mosquitto has been released. This is a bugfix release.
 # Clients
 - Fix date format in mosquitto_sub output. Closes [#2353].
 
-[#2297]: https://github.com/eclipse/mosquitto/issues/2297
-[#2306]: https://github.com/eclipse/mosquitto/issues/2306
-[#2314]: https://github.com/eclipse/mosquitto/issues/2314
-[#2326]: https://github.com/eclipse/mosquitto/issues/2326
-[#2339]: https://github.com/eclipse/mosquitto/issues/2339
-[#2350]: https://github.com/eclipse/mosquitto/issues/2350
-[#2353]: https://github.com/eclipse/mosquitto/issues/2353
+[#2297]: https://github.com/eclipse-mosquitto/mosquitto/issues/2297
+[#2306]: https://github.com/eclipse-mosquitto/mosquitto/issues/2306
+[#2314]: https://github.com/eclipse-mosquitto/mosquitto/issues/2314
+[#2326]: https://github.com/eclipse-mosquitto/mosquitto/issues/2326
+[#2339]: https://github.com/eclipse-mosquitto/mosquitto/issues/2339
+[#2350]: https://github.com/eclipse-mosquitto/mosquitto/issues/2350
+[#2353]: https://github.com/eclipse-mosquitto/mosquitto/issues/2353
diff --git a/www/posts/2021/11/version-2-0-14-released.md b/www/posts/2021/11/version-2-0-14-released.md
index 70e4319696..170a8467ba 100644
--- a/www/posts/2021/11/version-2-0-14-released.md
+++ b/www/posts/2021/11/version-2-0-14-released.md
@@ -19,5 +19,5 @@ Versions 2.0.14 of Mosquitto has been released. This is a bugfix release.
   Closes [#2364].
 - Fix incorrect `subscribe_callback` in mosquittopp.h. Closes [#2367].
 
-[#2364]: https://github.com/eclipse/mosquitto/issues/2364
-[#2367]: https://github.com/eclipse/mosquitto/issues/2367
+[#2364]: https://github.com/eclipse-mosquitto/mosquitto/issues/2364
+[#2367]: https://github.com/eclipse-mosquitto/mosquitto/issues/2367
diff --git a/www/posts/2022/08/version-2-0-15-released.md b/www/posts/2022/08/version-2-0-15-released.md
index 2b59abce93..d9254d820a 100644
--- a/www/posts/2022/08/version-2-0-15-released.md
+++ b/www/posts/2022/08/version-2-0-15-released.md
@@ -76,26 +76,26 @@ and bugfix release.
   Closes [#2471].
 
 
-[#1488]: https://github.com/eclipse/mosquitto/issues/1488
-[#2404]: https://github.com/eclipse/mosquitto/issues/2404
-[#2448]: https://github.com/eclipse/mosquitto/issues/2448
-[#2463]: https://github.com/eclipse/mosquitto/issues/2463
-[#2467]: https://github.com/eclipse/mosquitto/issues/2467
-[#2470]: https://github.com/eclipse/mosquitto/issues/2470
-[#2471]: https://github.com/eclipse/mosquitto/issues/2471
-[#2489]: https://github.com/eclipse/mosquitto/issues/2489
-[#2494]: https://github.com/eclipse/mosquitto/issues/2494
-[#2520]: https://github.com/eclipse/mosquitto/issues/2520
-[#2522]: https://github.com/eclipse/mosquitto/issues/2522
-[#2525]: https://github.com/eclipse/mosquitto/issues/2525
-[#2537]: https://github.com/eclipse/mosquitto/issues/2537
-[#2545]: https://github.com/eclipse/mosquitto/issues/2545
-[#2546]: https://github.com/eclipse/mosquitto/issues/2546
-[#2561]: https://github.com/eclipse/mosquitto/issues/2561
-[#2564]: https://github.com/eclipse/mosquitto/issues/2564
-[#2594]: https://github.com/eclipse/mosquitto/issues/2594
-[#2598]: https://github.com/eclipse/mosquitto/issues/2598
-[#2601]: https://github.com/eclipse/mosquitto/issues/2601
-[#2604]: https://github.com/eclipse/mosquitto/issues/2604
-[#2607]: https://github.com/eclipse/mosquitto/issues/2607
-[#2609]: https://github.com/eclipse/mosquitto/issues/2609
+[#1488]: https://github.com/eclipse-mosquitto/mosquitto/issues/1488
+[#2404]: https://github.com/eclipse-mosquitto/mosquitto/issues/2404
+[#2448]: https://github.com/eclipse-mosquitto/mosquitto/issues/2448
+[#2463]: https://github.com/eclipse-mosquitto/mosquitto/issues/2463
+[#2467]: https://github.com/eclipse-mosquitto/mosquitto/issues/2467
+[#2470]: https://github.com/eclipse-mosquitto/mosquitto/issues/2470
+[#2471]: https://github.com/eclipse-mosquitto/mosquitto/issues/2471
+[#2489]: https://github.com/eclipse-mosquitto/mosquitto/issues/2489
+[#2494]: https://github.com/eclipse-mosquitto/mosquitto/issues/2494
+[#2520]: https://github.com/eclipse-mosquitto/mosquitto/issues/2520
+[#2522]: https://github.com/eclipse-mosquitto/mosquitto/issues/2522
+[#2525]: https://github.com/eclipse-mosquitto/mosquitto/issues/2525
+[#2537]: https://github.com/eclipse-mosquitto/mosquitto/issues/2537
+[#2545]: https://github.com/eclipse-mosquitto/mosquitto/issues/2545
+[#2546]: https://github.com/eclipse-mosquitto/mosquitto/issues/2546
+[#2561]: https://github.com/eclipse-mosquitto/mosquitto/issues/2561
+[#2564]: https://github.com/eclipse-mosquitto/mosquitto/issues/2564
+[#2594]: https://github.com/eclipse-mosquitto/mosquitto/issues/2594
+[#2598]: https://github.com/eclipse-mosquitto/mosquitto/issues/2598
+[#2601]: https://github.com/eclipse-mosquitto/mosquitto/issues/2601
+[#2604]: https://github.com/eclipse-mosquitto/mosquitto/issues/2604
+[#2607]: https://github.com/eclipse-mosquitto/mosquitto/issues/2607
+[#2609]: https://github.com/eclipse-mosquitto/mosquitto/issues/2609
diff --git a/www/posts/2023/08/version-2-0-16-released.md b/www/posts/2023/08/version-2-0-16-released.md
index 4cf08a2593..7e3f342683 100644
--- a/www/posts/2023/08/version-2-0-16-released.md
+++ b/www/posts/2023/08/version-2-0-16-released.md
@@ -70,15 +70,15 @@ and bugfix release.
 [CVE-2023-0809]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-0809
 [CVE-2023-28366]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-27366
 [CVE-2023-3592]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-3592
-[#2354]: https://github.com/eclipse/mosquitto/issues/2354
-[#2634]: https://github.com/eclipse/mosquitto/issues/2634
-[#2708]: https://github.com/eclipse/mosquitto/issues/2708
-[#2722]: https://github.com/eclipse/mosquitto/issues/2722
-[#2722]: https://github.com/eclipse/mosquitto/issues/2722
-[#2732]: https://github.com/eclipse/mosquitto/issues/2732
-[#2746]: https://github.com/eclipse/mosquitto/issues/2746
-[#2749]: https://github.com/eclipse/mosquitto/issues/2749
-[#2760]: https://github.com/eclipse/mosquitto/issues/2760
-[#2794]: https://github.com/eclipse/mosquitto/issues/2794
-[#1488]: https://github.com/eclipse/mosquitto/issues/1488
+[#2354]: https://github.com/eclipse-mosquitto/mosquitto/issues/2354
+[#2634]: https://github.com/eclipse-mosquitto/mosquitto/issues/2634
+[#2708]: https://github.com/eclipse-mosquitto/mosquitto/issues/2708
+[#2722]: https://github.com/eclipse-mosquitto/mosquitto/issues/2722
+[#2722]: https://github.com/eclipse-mosquitto/mosquitto/issues/2722
+[#2732]: https://github.com/eclipse-mosquitto/mosquitto/issues/2732
+[#2746]: https://github.com/eclipse-mosquitto/mosquitto/issues/2746
+[#2749]: https://github.com/eclipse-mosquitto/mosquitto/issues/2749
+[#2760]: https://github.com/eclipse-mosquitto/mosquitto/issues/2760
+[#2794]: https://github.com/eclipse-mosquitto/mosquitto/issues/2794
+[#1488]: https://github.com/eclipse-mosquitto/mosquitto/issues/1488
 
diff --git a/www/posts/2023/08/version-2-0-17-released.md b/www/posts/2023/08/version-2-0-17-released.md
index aae33410c6..707b628cc2 100644
--- a/www/posts/2023/08/version-2-0-17-released.md
+++ b/www/posts/2023/08/version-2-0-17-released.md
@@ -19,6 +19,6 @@ Broker:
 Apps:
 - Fix `mosquitto_passwd -U` backup file creation. Closes [#2873].
 
-[#2873]: https://github.com/eclipse/mosquitto/issues/2873
-[#2876]: https://github.com/eclipse/mosquitto/issues/2876
-[#2879]: https://github.com/eclipse/mosquitto/issues/2879
+[#2873]: https://github.com/eclipse-mosquitto/mosquitto/issues/2873
+[#2876]: https://github.com/eclipse-mosquitto/mosquitto/issues/2876
+[#2879]: https://github.com/eclipse-mosquitto/mosquitto/issues/2879
diff --git a/www/posts/2023/09/version-2-0-18-released.md b/www/posts/2023/09/version-2-0-18-released.md
index 4c234e3c47..510b6e6ce8 100644
--- a/www/posts/2023/09/version-2-0-18-released.md
+++ b/www/posts/2023/09/version-2-0-18-released.md
@@ -18,6 +18,6 @@ Broker:
 Clients:
 - Fix mosquitto_rr not honouring `-R`. Closes [#2893].
 
-[#2881]: https://github.com/eclipse/mosquitto/issues/2881
-[#2885]: https://github.com/eclipse/mosquitto/issues/2885
-[#2893]: https://github.com/eclipse/mosquitto/issues/2893
+[#2881]: https://github.com/eclipse-mosquitto/mosquitto/issues/2881
+[#2885]: https://github.com/eclipse-mosquitto/mosquitto/issues/2885
+[#2893]: https://github.com/eclipse-mosquitto/mosquitto/issues/2893
diff --git a/www/posts/2024/10/version-2-0-19-released.md b/www/posts/2024/10/version-2-0-19-released.md
index d3677903c5..cdafe999e4 100644
--- a/www/posts/2024/10/version-2-0-19-released.md
+++ b/www/posts/2024/10/version-2-0-19-released.md
@@ -34,6 +34,6 @@ Version 2.0.19 of Mosquitto has been released. This is a security and bugfix rel
 # Build
 - Thread support is re-enabled on Windows.
 
-[#2579]: https://github.com/eclipse/mosquitto/issues/2579
-[#3054]: https://github.com/eclipse/mosquitto/issues/3054
-[#3089]: https://github.com/eclipse/mosquitto/issues/3089
+[#2579]: https://github.com/eclipse-mosquitto/mosquitto/issues/2579
+[#3054]: https://github.com/eclipse-mosquitto/mosquitto/issues/3054
+[#3089]: https://github.com/eclipse-mosquitto/mosquitto/issues/3089
diff --git a/www/posts/2024/10/version-2-0-20-released.md b/www/posts/2024/10/version-2-0-20-released.md
index b272281ca7..b5367be086 100644
--- a/www/posts/2024/10/version-2-0-20-released.md
+++ b/www/posts/2024/10/version-2-0-20-released.md
@@ -24,7 +24,7 @@ Version 2.0.20 of Mosquitto has been released. This is a bugfix release.
 # Build
 - Fix build on NetBSD
 
-[#3052]: https://github.com/eclipse/mosquitto/issues/3052
-[#3119]: https://github.com/eclipse/mosquitto/issues/3119
-[#3125]: https://github.com/eclipse/mosquitto/issues/3125
-[#3128]: https://github.com/eclipse/mosquitto/issues/3128
+[#3052]: https://github.com/eclipse-mosquitto/mosquitto/issues/3052
+[#3119]: https://github.com/eclipse-mosquitto/mosquitto/issues/3119
+[#3125]: https://github.com/eclipse-mosquitto/mosquitto/issues/3125
+[#3128]: https://github.com/eclipse-mosquitto/mosquitto/issues/3128
diff --git a/www/posts/2025/03/version-2-0-21-released.md b/www/posts/2025/03/version-2-0-21-released.md
index 4526f309bb..db54d48643 100644
--- a/www/posts/2025/03/version-2-0-21-released.md
+++ b/www/posts/2025/03/version-2-0-21-released.md
@@ -49,15 +49,15 @@ Client library:
   tests when under load. Closes [#3208].
 
 [#eclipse 248]: https://gitlab.eclipse.org/security/vulnerability-reports/-/issues/248
-[#1836]: https://github.com/eclipse/mosquitto/issues/1836
-[#2325]: https://github.com/eclipse/mosquitto/issues/2325
-[#2696]: https://github.com/eclipse/mosquitto/issues/2696
-[#3130]: https://github.com/eclipse/mosquitto/issues/3130
-[#3138]: https://github.com/eclipse/mosquitto/issues/3138
-[#3143]: https://github.com/eclipse/mosquitto/issues/3143
-[#3175]: https://github.com/eclipse/mosquitto/issues/3175
-[#3192]: https://github.com/eclipse/mosquitto/issues/3192
-[#3198]: https://github.com/eclipse/mosquitto/issues/3198
-[#3208]: https://github.com/eclipse/mosquitto/issues/3208
-[#3219]: https://github.com/eclipse/mosquitto/issues/3219
-[#3221]: https://github.com/eclipse/mosquitto/issues/3221
+[#1836]: https://github.com/eclipse-mosquitto/mosquitto/issues/1836
+[#2325]: https://github.com/eclipse-mosquitto/mosquitto/issues/2325
+[#2696]: https://github.com/eclipse-mosquitto/mosquitto/issues/2696
+[#3130]: https://github.com/eclipse-mosquitto/mosquitto/issues/3130
+[#3138]: https://github.com/eclipse-mosquitto/mosquitto/issues/3138
+[#3143]: https://github.com/eclipse-mosquitto/mosquitto/issues/3143
+[#3175]: https://github.com/eclipse-mosquitto/mosquitto/issues/3175
+[#3192]: https://github.com/eclipse-mosquitto/mosquitto/issues/3192
+[#3198]: https://github.com/eclipse-mosquitto/mosquitto/issues/3198
+[#3208]: https://github.com/eclipse-mosquitto/mosquitto/issues/3208
+[#3219]: https://github.com/eclipse-mosquitto/mosquitto/issues/3219
+[#3221]: https://github.com/eclipse-mosquitto/mosquitto/issues/3221
diff --git a/www/posts/2025/07/version-2-0-22-released.md b/www/posts/2025/07/version-2-0-22-released.md
index 71c5a2be04..745691008a 100644
--- a/www/posts/2025/07/version-2-0-22-released.md
+++ b/www/posts/2025/07/version-2-0-22-released.md
@@ -51,19 +51,19 @@ Tests:
 - Fix 08-ssl-connect-cert-auth-expired and 08-ssl-connect-cert-auth-revoked
   tests when running on a single CPU system. Closes [#3230].
 
-[#1211]: https://github.com/eclipse/mosquitto/issues/1211
-[#3167]: https://github.com/eclipse/mosquitto/issues/3167
-[#3226]: https://github.com/eclipse/mosquitto/issues/3226
-[#3230]: https://github.com/eclipse/mosquitto/issues/3230
-[#3238]: https://github.com/eclipse/mosquitto/issues/3238
-[#3244]: https://github.com/eclipse/mosquitto/issues/3244
-[#3250]: https://github.com/eclipse/mosquitto/issues/3250
-[#3253]: https://github.com/eclipse/mosquitto/issues/3253
-[#3258]: https://github.com/eclipse/mosquitto/issues/3258
-[#3259]: https://github.com/eclipse/mosquitto/issues/3259
-[#3261]: https://github.com/eclipse/mosquitto/issues/3261
-[#3267]: https://github.com/eclipse/mosquitto/issues/3267
-[#3269]: https://github.com/eclipse/mosquitto/issues/3269
-[#3272]: https://github.com/eclipse/mosquitto/issues/3272
-[#3286]: https://github.com/eclipse/mosquitto/issues/3286
-[#3302]: https://github.com/eclipse/mosquitto/issues/3302
+[#1211]: https://github.com/eclipse-mosquitto/mosquitto/issues/1211
+[#3167]: https://github.com/eclipse-mosquitto/mosquitto/issues/3167
+[#3226]: https://github.com/eclipse-mosquitto/mosquitto/issues/3226
+[#3230]: https://github.com/eclipse-mosquitto/mosquitto/issues/3230
+[#3238]: https://github.com/eclipse-mosquitto/mosquitto/issues/3238
+[#3244]: https://github.com/eclipse-mosquitto/mosquitto/issues/3244
+[#3250]: https://github.com/eclipse-mosquitto/mosquitto/issues/3250
+[#3253]: https://github.com/eclipse-mosquitto/mosquitto/issues/3253
+[#3258]: https://github.com/eclipse-mosquitto/mosquitto/issues/3258
+[#3259]: https://github.com/eclipse-mosquitto/mosquitto/issues/3259
+[#3261]: https://github.com/eclipse-mosquitto/mosquitto/issues/3261
+[#3267]: https://github.com/eclipse-mosquitto/mosquitto/issues/3267
+[#3269]: https://github.com/eclipse-mosquitto/mosquitto/issues/3269
+[#3272]: https://github.com/eclipse-mosquitto/mosquitto/issues/3272
+[#3286]: https://github.com/eclipse-mosquitto/mosquitto/issues/3286
+[#3302]: https://github.com/eclipse-mosquitto/mosquitto/issues/3302