diff --git a/common/dialogs/html_message_box.cpp b/common/dialogs/html_message_box.cpp
index abdf86bdaa..9a4c2d9cb0 100644
--- a/common/dialogs/html_message_box.cpp
+++ b/common/dialogs/html_message_box.cpp
@@ -150,13 +150,13 @@ void HTML_MESSAGE_BOX::OnHTMLLinkClicked( wxHtmlLinkEvent& event )
 {
     wxString href = event.GetLinkInfo().GetHref();
 
-    if( href.StartsWith( wxS( "https://docs.kicad.org/" ) ) )
+    if( href.StartsWith( wxS( "https://go.kicad.org/docs" ) ) )
     {
         href.Replace( wxS( "GetMajorMinorVersion" ), GetMajorMinorVersion() );
-
-        wxURI uri( href );
-        wxLaunchDefaultBrowser( uri.BuildURI() );
     }
+
+    wxURI uri( href );
+    wxLaunchDefaultBrowser( uri.BuildURI() );
 }
 
 
diff --git a/common/tool/common_control.cpp b/common/tool/common_control.cpp
index 6c024eeab4..568a80e90a 100644
--- a/common/tool/common_control.cpp
+++ b/common/tool/common_control.cpp
@@ -43,9 +43,9 @@
 #include <eda_doc.h>
 #include <wx/msgdlg.h>
 
-#define URL_GET_INVOLVED wxS( "https://kicad.org/contribute/" )
+#define URL_GET_INVOLVED wxS( "https://go.kicad.org/contribute/" )
 #define URL_DONATE wxS( "https://go.kicad.org/app-donate" )
-#define URL_DOCUMENTATION wxS( "https://docs.kicad.org/" )
+#define URL_DOCUMENTATION wxS( "https://go.kicad.org/docs/" )
 
 
 /// URL to launch a new issue with pre-populated description
@@ -210,7 +210,7 @@ int COMMON_CONTROL::ShowHelp( const TOOL_EVENT& aEvent )
     wxString helpFile;
     wxString msg;
 
-    // the URL of help files is "https://docs.kicad.org/<version>/<language>/<name>/"
+    // the URL of help files is "https://go.kicad.org/docs/<version>/<language>/<name>/"
     const wxString baseUrl = URL_DOCUMENTATION + GetMajorMinorVersion() + wxT( "/" )
                              + Pgm().GetLocale()->GetName().BeforeLast( '_' ) + wxT( "/" );
 
diff --git a/pcbnew/dialogs/panel_setup_rules_help_10documentation.h b/pcbnew/dialogs/panel_setup_rules_help_10documentation.h
index bd28a43c3f..31d6d5ff87 100644
--- a/pcbnew/dialogs/panel_setup_rules_help_10documentation.h
+++ b/pcbnew/dialogs/panel_setup_rules_help_10documentation.h
@@ -1,4 +1,4 @@
 // Do not edit this file, it is autogenerated by CMake from the .md file
 _HKI( "### Documentation\n"
 "\n"
-"For the full documentation see [https://docs.kicad.org](https://docs.kicad.org/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules)." );
+"For the full documentation see [https://docs.kicad.org](https://go.kicad.org/docs/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules)." );
diff --git a/pcbnew/dialogs/panel_setup_rules_help_10documentation.md b/pcbnew/dialogs/panel_setup_rules_help_10documentation.md
index da977e2578..0e38b4371e 100644
--- a/pcbnew/dialogs/panel_setup_rules_help_10documentation.md
+++ b/pcbnew/dialogs/panel_setup_rules_help_10documentation.md
@@ -1,3 +1,3 @@
 ### Documentation
 
-For the full documentation see [https://docs.kicad.org](https://docs.kicad.org/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules).
\ No newline at end of file
+For the full documentation see [https://docs.kicad.org](https://go.kicad.org/docs/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules).
\ No newline at end of file
diff --git a/pcbnew/dialogs/panel_setup_rules_help_7properties.h b/pcbnew/dialogs/panel_setup_rules_help_7properties.h
index ba8bd985e5..81a72d99d4 100644
--- a/pcbnew/dialogs/panel_setup_rules_help_7properties.h
+++ b/pcbnew/dialogs/panel_setup_rules_help_7properties.h
@@ -1,7 +1,7 @@
 // Do not edit this file, it is autogenerated by CMake from the .md file
 _HKI( "### Properties\n"
 "\n"
-"Many properties of objects are available for testing in custom rule expressions. See the full documentation at [https://docs.kicad.org](https://docs.kicad.org/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules) for the complete list.\n"
+"Many properties of objects are available for testing in custom rule expressions. See the full documentation at [https://docs.kicad.org](https://go.kicad.org/docs/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules) for the complete list.\n"
 "<br><br><br>\n"
 "\n"
 "" );
diff --git a/pcbnew/dialogs/panel_setup_rules_help_7properties.md b/pcbnew/dialogs/panel_setup_rules_help_7properties.md
index 57b1b61756..2d602c9b84 100644
--- a/pcbnew/dialogs/panel_setup_rules_help_7properties.md
+++ b/pcbnew/dialogs/panel_setup_rules_help_7properties.md
@@ -1,5 +1,5 @@
 ### Properties
 
-Many properties of objects are available for testing in custom rule expressions. See the full documentation at [https://docs.kicad.org](https://docs.kicad.org/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules) for the complete list.
+Many properties of objects are available for testing in custom rule expressions. See the full documentation at [https://docs.kicad.org](https://go.kicad.org/docs/GetMajorMinorVersion/en/pcbnew/pcbnew.html#custom_design_rules) for the complete list.
 <br><br><br>