diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index fec00b3d12675b4244c311d1683f5cc415a205ad..39de96e875536252a2f9947ebf5c2cd1e125d902 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 Feeds 6.x 1.0 xxxxxxxxxxxxxxxxxxxx
 ----------------------------------
 
+- #778416 clemens.tolboom: Better message when plugin is missing.
 - #760140 lyricnz: FeedsBatch->total not updated when addItem($item) is called.
 - #755544 Monkey Master: Keep batch processing when mapping fails.
 - alex_b: Reset import schedule after deleting items from feed.
diff --git a/feeds.module b/feeds.module
index 2c89ddb9dcbd196e02349427da6520cd9a41696b..a031747791d909dc013115690fe660767be06cd1 100644
--- a/feeds.module
+++ b/feeds.module
@@ -700,7 +700,14 @@ function feeds_plugin_instance($plugin, $id) {
   if ($class = ctools_plugin_load_class('feeds', 'plugins', $plugin, 'handler')) {
     return FeedsConfigurable::instance($class, $id);
   }
-  drupal_set_message(t('Missing Feeds plugin. Check whether all required libraries and modules are installed properly.'), 'warning');
+  $args = array( '%plugin' => $plugin);
+  if (user_access('administer feeds')) {
+    $args['!link'] = l($id, 'admin/build/feeds/edit/' . $id);
+    drupal_set_message(t('Missing Feeds plugin %plugin. See !link. Check whether all required libraries and modules are installed properly.', $args), 'warning');
+  }
+  else {
+    drupal_set_message(t('Missing Feeds plugin %plugin. Please contact your site administrator.', $args), 'warning');
+  }
   $class = ctools_plugin_load_class('feeds', 'plugins', 'FeedsMissingPlugin', 'handler');
   return FeedsConfigurable::instance($class, $id);
 }