diff --git a/man/mosquitto.8.xml b/man/mosquitto.8.xml
index 4d7dd982..ecec6bfb 100644
--- a/man/mosquitto.8.xml
+++ b/man/mosquitto.8.xml
@@ -474,7 +474,7 @@
 	<refsect1>
 		<title>Bugs</title>
 		<para><command>mosquitto</command> bug information can be found at
-			<uri type="webpage">https://github.com/eclipse/mosquitto/issues</uri></para>
+			<ulink url="https://github.com/eclipse/mosquitto/issues"/></para>
 	</refsect1>
 
 	<refsect1>
diff --git a/man/mosquitto.conf.5.xml b/man/mosquitto.conf.5.xml
index 1005a9da..00216c59 100644
--- a/man/mosquitto.conf.5.xml
+++ b/man/mosquitto.conf.5.xml
@@ -1397,7 +1397,7 @@ topic clients/total in 0 test/mosquitto/org $SYS/broker/
 	<refsect1>
 		<title>Bugs</title>
 		<para><command>mosquitto</command> bug information can be found at
-			<uri type="webpage">https://github.com/eclipse/mosquitto/issues</uri></para>
+			<ulink url="https://github.com/eclipse/mosquitto/issues"/></para>
 	</refsect1>
 
 	<refsect1>
diff --git a/man/mosquitto_passwd.1.xml b/man/mosquitto_passwd.1.xml
index a7bc67d0..95b3c130 100644
--- a/man/mosquitto_passwd.1.xml
+++ b/man/mosquitto_passwd.1.xml
@@ -124,7 +124,7 @@
 	<refsect1>
 		<title>Bugs</title>
 		<para><command>mosquitto</command> bug information can be found at
-			<uri type="webpage">https://github.com/eclipse/mosquitto/issues</uri></para>
+			<ulink url="https://github.com/eclipse/mosquitto/issues"/></para>
 	</refsect1>
 
 	<refsect1>
diff --git a/man/mosquitto_pub.1.xml b/man/mosquitto_pub.1.xml
index 25efdc22..7d214861 100644
--- a/man/mosquitto_pub.1.xml
+++ b/man/mosquitto_pub.1.xml
@@ -476,7 +476,7 @@
 	<refsect1>
 		<title>Bugs</title>
 		<para><command>mosquitto</command> bug information can be found at
-			<uri type="webpage">https://github.com/eclipse/mosquitto/issues</uri></para>
+			<ulink url="https://github.com/eclipse/mosquitto/issues"/></para>
 	</refsect1>
 
 	<refsect1>
diff --git a/man/mosquitto_sub.1.xml b/man/mosquitto_sub.1.xml
index 953fd9ac..876f7dca 100644
--- a/man/mosquitto_sub.1.xml
+++ b/man/mosquitto_sub.1.xml
@@ -509,7 +509,7 @@
 	<refsect1>
 		<title>Bugs</title>
 		<para><command>mosquitto</command> bug information can be found at
-			<uri type="webpage">https://github.com/eclipse/mosquitto/issues</uri></para>
+			<ulink url="https://github.com/eclipse/mosquitto/issues"/></para>
 	</refsect1>
 
 	<refsect1>