diff --git a/src/octoprint/plugins/announcements/__init__.py b/src/octoprint/plugins/announcements/__init__.py
index f65843cb..02af3366 100644
--- a/src/octoprint/plugins/announcements/__init__.py
+++ b/src/octoprint/plugins/announcements/__init__.py
@@ -411,4 +411,9 @@ def _strip_tags(text):
 
 
 __plugin_name__ = "Announcement Plugin"
+__plugin_author__ = "Gina Häußge"
+__plugin_description__ = "Announcements all around OctoPrint"
+__plugin_disabling_discouraged__ = gettext("Without this plugin you might miss important announcements "
+                                           "regarding security or other critical issues concerning OctoPrint.")
+__plugin_license__ = "AGPLv3"
 __plugin_implementation__ = AnnouncementPlugin()
diff --git a/src/octoprint/plugins/corewizard/__init__.py b/src/octoprint/plugins/corewizard/__init__.py
index 7ce014be..d9c61f67 100644
--- a/src/octoprint/plugins/corewizard/__init__.py
+++ b/src/octoprint/plugins/corewizard/__init__.py
@@ -172,5 +172,9 @@ class CoreWizardPlugin(octoprint.plugin.AssetPlugin,
 
 
 __plugin_name__ = "Core Wizard"
+__plugin_author__ = "Gina Häußge"
 __plugin_description__ = "Provides wizard dialogs for core components and functionality"
+__plugin_disabling_discouraged__ = gettext("Without this plugin OctoPrint will no longer be able to perform "
+                                           "setup steps that might be required after an update.")
+__plugin_license__ = "AGPLv3"
 __plugin_implementation__ = CoreWizardPlugin()
diff --git a/src/octoprint/plugins/cura/__init__.py b/src/octoprint/plugins/cura/__init__.py
index 058445d6..5fd933fb 100644
--- a/src/octoprint/plugins/cura/__init__.py
+++ b/src/octoprint/plugins/cura/__init__.py
@@ -505,7 +505,7 @@ def _get_usage_from_length(filament_length, filament_diameter):
 
 __plugin_name__ = "CuraEngine (<= 15.04)"
 __plugin_author__ = "Gina Häußge"
-__plugin_url__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Cura"
+__plugin_url__ = "http://docs.octoprint.org/en/master/bundledplugins/cura.html"
 __plugin_description__ = "Adds support for slicing via CuraEngine versions up to and including version 15.04 from within OctoPrint"
 __plugin_license__ = "AGPLv3"
 __plugin_implementation__ = CuraPlugin()
diff --git a/src/octoprint/plugins/discovery/__init__.py b/src/octoprint/plugins/discovery/__init__.py
index 7e055a27..988d4840 100644
--- a/src/octoprint/plugins/discovery/__init__.py
+++ b/src/octoprint/plugins/discovery/__init__.py
@@ -12,6 +12,7 @@ The SSDP/UPNP implementations has been largely inspired by https://gist.github.c
 import logging
 import os
 import flask
+from flask.ext.babel import gettext
 from builtins import range
 
 import octoprint.plugin
@@ -25,8 +26,10 @@ except:
 
 __plugin_name__ = "Discovery"
 __plugin_author__ = "Gina Häußge"
-__plugin_url__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Discovery"
+__plugin_url__ = "http://docs.octoprint.org/en/master/bundledplugins/discovery.html"
 __plugin_description__ = "Makes the OctoPrint instance discoverable via Bonjour/Avahi/Zeroconf and uPnP"
+__plugin_disabling_discouraged__ = gettext("Without this plugin your OctoPrint instance will no longer be "
+                                           "discoverable on the network via Bonjour and uPnP.")
 __plugin_license__ = "AGPLv3"
 
 def __plugin_load__():
diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index bad8392f..d9065bd4 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -725,7 +725,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 
 __plugin_name__ = "Plugin Manager"
 __plugin_author__ = "Gina Häußge"
-__plugin_url__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Plugin-Manager"
+__plugin_url__ = "http://docs.octoprint.org/en/master/bundledplugins/pluginmanager.html"
 __plugin_description__ = "Allows installing and managing OctoPrint plugins"
 __plugin_license__ = "AGPLv3"
 
diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py
index e35356fa..7e0d57e4 100644
--- a/src/octoprint/plugins/softwareupdate/__init__.py
+++ b/src/octoprint/plugins/softwareupdate/__init__.py
@@ -18,6 +18,7 @@ import hashlib
 
 from . import version_checks, updaters, exceptions, util, cli
 
+from flask.ext.babel import gettext
 
 from octoprint.server.util.flask import restricted_access, with_revalidation_checking, check_etag
 from octoprint.server import admin_permission, VERSION, REVISION, BRANCH
@@ -1043,8 +1044,11 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
 
 __plugin_name__ = "Software Update"
 __plugin_author__ = "Gina Häußge"
-__plugin_url__ = "https://github.com/foosel/OctoPrint/wiki/Plugin:-Software-Update"
+__plugin_url__ = "http://docs.octoprint.org/en/master/bundledplugins/softwareupdate.html"
 __plugin_description__ = "Allows receiving update notifications and performing updates of OctoPrint and plugins"
+__plugin_disabling_discouraged__ = gettext("Without this plugin OctoPrint will no longer be able to "
+                                           "update itself or any of your installed plugins which might put "
+                                           "your system at risk.")
 __plugin_license__ = "AGPLv3"
 def __plugin_load__():
 	global __plugin_implementation__