diff --git a/usr/local/www/help.php b/usr/local/www/help.php
index 6938d13e2..dd081a2ca 100644
--- a/usr/local/www/help.php
+++ b/usr/local/www/help.php
@@ -13,11 +13,11 @@ require_once("guiconfig.inc");
 $helppages = array(
 	/* These pages are confirmed to work and have usable content */
 	'index.php' => 'https://doc.pfsense.org/index.php/Dashboard',
-	'license.php' => 'https://www.pfsense.org/index.php@option=com_content&task=view&id=42&Itemid=62.html',
-	'miniupnpd.xml' => 'https://doc.pfsense.org/index.php/What_is_UPNP%3F',
-	'status_upnp.php' => 'https://doc.pfsense.org/index.php/What_is_UPNP%3F',
-	'firewall_virtual_ip.php' => 'https://doc.pfsense.org/index.php/What_are_Virtual_IP_Addresses%3F',
-	'firewall_virtual_ip_edit.php' => 'https://doc.pfsense.org/index.php/What_are_Virtual_IP_Addresses%3F',
+	'license.php' => 'https://www.pfsense.org/about-pfsense/#legal',
+	'miniupnpd.xml' => 'https://doc.pfsense.org/index.php/What_is_UPnP',
+	'status_upnp.php' => 'https://doc.pfsense.org/index.php/What_is_UPnP',
+	'firewall_virtual_ip.php' => 'https://doc.pfsense.org/index.php/What_are_Virtual_IP_Addresses',
+	'firewall_virtual_ip_edit.php' => 'https://doc.pfsense.org/index.php/What_are_Virtual_IP_Addresses',
 	'firewall_aliases.php' => 'https://doc.pfsense.org/index.php/Aliases',
 	'firewall_aliases_edit.php' => 'https://doc.pfsense.org/index.php/Aliases',
 	'firewall_aliases_import.php' => 'https://doc.pfsense.org/index.php/Aliases',
@@ -35,8 +35,8 @@ $helppages = array(
 	'status_rrd_graph.php' => 'https://doc.pfsense.org/index.php/RRD_Graphs',
 	'status_rrd_graph_img.php' => 'https://doc.pfsense.org/index.php/RRD_Graphs',
 	'status_rrd_graph_settings.php' => 'https://doc.pfsense.org/index.php/RRD_Graphs',
-	'firewall_nat.php' => 'https://doc.pfsense.org/index.php/How_can_I_forward_ports_with_pfSense%3F',
-	'firewall_nat_edit.php' => 'https://doc.pfsense.org/index.php/How_can_I_forward_ports_with_pfSense%3F',
+	'firewall_nat.php' => 'https://doc.pfsense.org/index.php/How_can_I_forward_ports_with_pfSense',
+	'firewall_nat_edit.php' => 'https://doc.pfsense.org/index.php/How_can_I_forward_ports_with_pfSense',
 	'diag_arp.php' => 'https://doc.pfsense.org/index.php/ARP_Table',
 	'diag_backup.php' => 'https://doc.pfsense.org/index.php/Configuration_Backup_and_Restore',
 	'diag_confbak.php' => 'https://doc.pfsense.org/index.php/Configuration_History',