diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 476810b64..f1b3402a0 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision: 1.12 $
-|     $Date: 2008-02-02 22:04:18 $
+|     $Revision: 1.13 $
+|     $Date: 2008-02-13 02:58:58 $
 |     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
@@ -483,7 +483,7 @@ function render_plugs($pluginList)
 			if ($plug_vars['administration']['configFile'] && $plug['plugin_installflag'] == true)
 			{
 				$conf_title = LAN_CONFIGURE.' '.$tp->toHtml($plug_vars['name'], "", "defs,emotes_off, no_make_clickable");
-				$plugin_icon = "<a title='{$conf_title}' href='".e_PLUGIN.$plug_vars['folder'].'/'.$plug_vars['administration']['configFile']."' >".$plugin_icon.'</a>';
+				$plugin_icon = "<a title='{$conf_title}' href='".e_PLUGIN.$plug['plugin_path'].'/'.$plug_vars['administration']['configFile']."' >".$plugin_icon.'</a>';
 			}
 
 			$text .= "
@@ -492,10 +492,11 @@ function render_plugs($pluginList)
 			<table style='width:100%'><tr><td style='text-align:left;width:40px;vertical-align:top'>
 			".$plugin_icon."
 			</td><td>
-			$img <b>".$tp->toHTML($plug['plugin_name'], false, "defs,emotes_off, no_make_clickable")."</b><br />".EPL_ADLAN_11." {$plug['plugin_version']}
-			<br />";
-
-			$text .="</td>
+			$img <b>".$tp->toHTML($plug['plugin_name'], false, "defs,emotes_off, no_make_clickable")."</b><br /><b>".EPL_ADLAN_11."</b>&nbsp;{$plug['plugin_version']}
+			<br /><br />
+			<b>".EPL_ADLAN_64."</b>&nbsp;".$plug['plugin_path']."
+			<br />
+			</td>
 			</tr></table>
 			</td>
 			<td class='forumheader3' style='vertical-align:top'>
@@ -509,7 +510,7 @@ function render_plugs($pluginList)
 			<tr><td style='vertical-align:top'><b>".EPL_ADLAN_14."</b>:</td><td style='vertical-align:top'> {$plug_vars['description']}&nbsp;";
 			if ($plug_vars['readme'])
 			{
-				$text .= "[ <a href='".e_PLUGIN.$plug_vars['folder']."/".$plug_vars['readme']."'>".$plug_vars['readme']."</a> ]";
+				$text .= "[ <a href='".e_PLUGIN.$plug['plugin_path']."/".$plug_vars['readme']."'>".$plug_vars['readme']."</a> ]";
 			}
 
 			$text .="</td></tr>
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index 3a44af9cf..23442c838 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/plugin_class.php,v $
-|     $Revision: 1.32 $
-|     $Date: 2008-02-13 00:56:00 $
+|     $Revision: 1.33 $
+|     $Date: 2008-02-13 02:58:58 $
 |     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
@@ -592,7 +592,9 @@ class e107plugin
 		$this->current_plug = $plug;
 		$txt = '';
 		$path = e_PLUGIN.$plug['plugin_path'].'/';
-
+		
+		$_folder = strtolower(preg_replace("#![a-zA-Z0-9]#", '', $plug['plugin_path']));
+		
 		//We'll just install using plugin.php file for now.
 		//return $this->install_plugin_php($path);
 
@@ -639,6 +641,7 @@ class e107plugin
 					{
 						preg_match("/CREATE TABLE(.*?)\(/si", $sql_table, $match);
 						$tablename = trim($match[1]);
+						$tablename = str_replace("[folder]", $_folder, $tablename);
 
 						if($function == 'uninstall' && isset($_POST['delete_tables']) && $_POST['delete_tables'])
 						{
@@ -648,6 +651,7 @@ class e107plugin
 						if($function == 'install')
 						{
 							$sql_table = preg_replace("/create table\s+/si", "CREATE TABLE ".MPREFIX, $sql_table);
+							$sql_table = str_replace("[folder]", $_folder, $sql_table);
 							$txt .= "Adding table: {$tablename} ... ";
 							$result = $this->manage_tables('add', array($sql_table));
 							$txt .= ($result ? "Success" : "Failed!")."<br />";
diff --git a/e107_languages/English/admin/lan_plugin.php b/e107_languages/English/admin/lan_plugin.php
index 229a41aa2..1b2343444 100644
--- a/e107_languages/English/admin/lan_plugin.php
+++ b/e107_languages/English/admin/lan_plugin.php
@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_plugin.php,v $
-|     $Revision: 1.3 $
-|     $Date: 2007-05-07 13:38:34 $
-|     $Author: e107steved $
+|     $Revision: 1.4 $
+|     $Date: 2008-02-13 02:58:58 $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 define("EPL_ADLAN_0", "Install");
@@ -84,6 +84,7 @@ define("EPL_ADLAN_60", "e107 will attempt to remove all plugin related files.");
 // define("EPL_ADLAN_61", "Confirm uninstall"); // duplicated. can be deleted.
 define("EPL_ADLAN_62", "Cancel uninstall");
 define("EPL_ADLAN_63", "Uninstall:");
+define("EPL_ADLAN_64", "Folder:");
 
 define("LAN_UPGRADE_SUCCESSFUL", "Upgrade Successful");
 define("LAN_INSTALL_SUCCESSFUL", "Installation Successful");