diff --git a/include/admin/plugins.inc.php b/include/admin/plugins.inc.php
index b2c939a8..e3532060 100644
--- a/include/admin/plugins.inc.php
+++ b/include/admin/plugins.inc.php
@@ -154,17 +154,17 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
                 }
 
                 if (@file_exists(dirname($plugin->pluginFile) . '/ChangeLog')) {
-                    echo '<br /><a href="plugins/' . $plugin->pluginPath . '/ChangeLog">' . PLUGIN_DOCUMENTATION_CHANGELOG . '</a>';
+                    echo '<br /><a href="plugins/' . $plugin->act_pluginPath . '/ChangeLog">' . PLUGIN_DOCUMENTATION_CHANGELOG . '</a>';
                 }
 
                 if (@file_exists(dirname($plugin->pluginFile) . '/documentation_' . $serendipity['lang'] . '.html')) {
-                    echo '<br /><a href="plugins/' . $plugin->pluginPath . '/documentation_' . $serendipity['lang'] . '.html">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
+                    echo '<br /><a href="plugins/' . $plugin->act_pluginPath . '/documentation_' . $serendipity['lang'] . '.html">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
                 } elseif (@file_exists(dirname($plugin->pluginFile) . '/documentation_en.html')) {
-                    echo '<br /><a href="plugins/' . $plugin->pluginPath . '/documentation_en.html">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
+                    echo '<br /><a href="plugins/' . $plugin->act_pluginPath . '/documentation_en.html">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
                 } elseif (@file_exists(dirname($plugin->pluginFile) . '/documentation.html')) {
-                    echo '<br /><a href="plugins/' . $plugin->pluginPath . '/documentation.html">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
+                    echo '<br /><a href="plugins/' . $plugin->act_pluginPath . '/documentation.html">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
                 } elseif (@file_exists(dirname($plugin->pluginFile) . '/README')) {
-                    echo '<br /><a href="plugins/' . $plugin->pluginPath . '/README">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
+                    echo '<br /><a href="plugins/' . $plugin->act_pluginPath . '/README">' . PLUGIN_DOCUMENTATION_LOCAL . '</a>';
                 }
             ?>
             </td>
@@ -229,7 +229,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
             $props['requirements'] = unserialize($props['requirements']);
 
             if (empty($props['changelog']) && @file_exists(dirname($plugin->pluginFile) . '/ChangeLog')) {
-                $props['changelog'] = 'plugins/' . $plugin->pluginPath . '/ChangeLog';
+                $props['changelog'] = 'plugins/' . $props['pluginPath'] . '/ChangeLog';
             }
 
             if (empty($props['local_documentation'])) {
diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
index 136ae6a8..11e6a124 100644
--- a/include/plugin_api.inc.php
+++ b/include/plugin_api.inc.php
@@ -568,7 +568,10 @@ class serendipity_plugin_api
             }
         }
         
-        $p->pluginPath = $pluginPath;
+        $p->pluginPath = $p->act_pluginPath = $pluginPath;
+        if (empty($p->act_pluginPath)) {
+            $p->act_pluginPath = $class_name;
+        }
         $p->pluginFile = $pluginFile;
 
         return $p;
@@ -1165,6 +1168,7 @@ class serendipity_plugin
     var $content_class = 'serendipitySideBarContent';
     var $title         = null;
     var $pluginPath    = null;
+    var $act_pluginPath= null;
     var $pluginFile    = null;
     var $serendipity_owner = null;