diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index bef13a5884af16dfb3b8a2194a35382ffd246499..d6f25f43e8be0690369919ce2a2acb2dbe6a74f4 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -31,8 +31,8 @@ bl_info = {
     "location": "View3D > Add > Mesh",
     "description": "Add extra mesh object types",
     "warning": "",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
-                "Py/Scripts/Add_Mesh/Add_Extra",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "add_mesh/mesh_extra_objects.html",
     "category": "Add Mesh",
 }
 
diff --git a/curve_tools/__init__.py b/curve_tools/__init__.py
index 47297f43f6bcfe2df4ebe4bca582de5abca28685..8de5b7d381d012ca99d8ed153f9c9b2901cd034b 100644
--- a/curve_tools/__init__.py
+++ b/curve_tools/__init__.py
@@ -18,7 +18,7 @@
 # Contributed to by guy lateur, Alexander MeiĂźner (Lichtso),
 # Dealga McArdle (zeffii), Marvin.K.Breuer (MKB),
 # Spivak Vladimir (cwolf3d)
-# Origunally an addon by Mackraken
+# Originally an addon by Mackraken
 
 
 bl_info = {
diff --git a/development_edit_operator.py b/development_edit_operator.py
index 6f84d0370554871efa3ae13a8e59d9554c8195e3..f0766b990044223b25dbb8993fe872702fb79472 100644
--- a/development_edit_operator.py
+++ b/development_edit_operator.py
@@ -25,8 +25,8 @@ bl_info = {
     "location": "Text Editor > Sidebar > Edit Operator",
     "description": "Opens source file of chosen operator or call locations, if source not available",
     "warning": "",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
-                "Py/Scripts/Development/Edit_Operator_Source",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "development/edit_operator.html",
     "category": "Development"}
 
 import bpy
diff --git a/development_icon_get.py b/development_icon_get.py
index 51c440e2ba9e2a1db8b27d01634284d498ecd5e0..37fae00a0150f57dcc9da258b5e087b0b631cdf5 100644
--- a/development_icon_get.py
+++ b/development_icon_get.py
@@ -26,8 +26,8 @@ bl_info = {
     "version": (1, 4, 0),
     "blender": (2, 80, 0),
     "location": "Text Editor > Dev Tab > Icon Viewer",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6"
-                "/Py/Scripts/Development/Display_All_Icons",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "development/icon_viewer.html",
     "category": "Development"
 }
 
diff --git a/development_iskeyfree.py b/development_iskeyfree.py
index 8664d5cc4aea0823999324cfe3c92a9b818350ac..3a5e33277293f42b9091a5dcb698a443ac614eae 100644
--- a/development_iskeyfree.py
+++ b/development_iskeyfree.py
@@ -25,8 +25,8 @@ bl_info = {
     "blender": (2, 80, 0),
     "location": "Text Editor > Sidebar > Dev Tab",
     "description": "Find free shortcuts, inform about used and print a key list",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6"
-                "/Py/Scripts/Development/IsKeyFree",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "development/is_key_free.html",
     "category": "Development"
 }
 
diff --git a/space_view3d_copy_attributes.py b/space_view3d_copy_attributes.py
index adc85f9cf6b270ab226a591de8af88a75a97232f..1e4f664ca587e2d3ff23fd877bfd36fd3c06fb92 100644
--- a/space_view3d_copy_attributes.py
+++ b/space_view3d_copy_attributes.py
@@ -25,8 +25,8 @@ bl_info = {
     "blender": (2, 80, 0),
     "location": "View3D > Ctrl-C",
     "description": "Copy Attributes Menu from Blender 2.4",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
-                "Scripts/3D_interaction/Copy_Attributes_Menu",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "interface/copy_attributes.html",
     "category": "Interface",
 }
 
diff --git a/space_view3d_modifier_tools.py b/space_view3d_modifier_tools.py
index 460b16f047683a403ed1a51c0234a4f100c7c8e4..ba71532e9500fdb8f9940597d5ef457702567a29 100644
--- a/space_view3d_modifier_tools.py
+++ b/space_view3d_modifier_tools.py
@@ -25,8 +25,8 @@ bl_info = {
     "location": "Properties > Modifiers",
     "description": "Modifiers Specials Show/Hide/Apply Selected",
     "warning": "",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6"
-                "/Py/Scripts/3D_interaction/modifier_tools",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "interface/modifier_tools.html",
     "category": "Interface"
     }
 
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index 98a62bc8c248104310cf09cd4b304b0c46f6a021..e211e1fa885c3a31802669d399c169496ff36119 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -39,8 +39,8 @@ bl_info = {
     "description": "Pie Menu Activation",
     "location": "Addons Preferences",
     "warning": "",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
-                "Scripts/3D_interaction/viewport_pies",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "interface/viewport_pies.html",
     "category": "Interface"
     }
 
diff --git a/space_view3d_spacebar_menu/__init__.py b/space_view3d_spacebar_menu/__init__.py
index 362cad557ca18e1bb4003c300ebb40a607984eb7..8cb0a427d26f35ada7602a754201ac8ea482c370 100644
--- a/space_view3d_spacebar_menu/__init__.py
+++ b/space_view3d_spacebar_menu/__init__.py
@@ -25,8 +25,8 @@ bl_info = {
     "location": "View3D > Spacebar",
     "description": "Object Mode Context Sensitive Spacebar Menu",
     "warning": "",
-    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
-                "Scripts/3D_interaction/Dynamic_Spacebar_Menu",
+    "wiki_url": "https://docs.blender.org/manual/en/dev/addons/"
+                "interface/context_menu.html",
     "category": "Interface",
 }