diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php
index dc680de70..e3f25372a 100644
--- a/e107_plugins/poll/admin_config.php
+++ b/e107_plugins/poll/admin_config.php
@@ -11,19 +11,21 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/admin_config.php,v $
-|     $Revision: 1.4 $
-|     $Date: 2007-11-01 22:46:19 $
+|     $Revision: 1.5 $
+|     $Date: 2008-08-16 16:25:45 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 require_once("../../class2.php");
 if (!is_object($tp)) $tp = new e_parse;
-if (!getperms("P")) {
+if (!getperms("P")) 
+{
 	header("location:".e_BASE."index.php");
 	exit;
 }
 $e_sub_cat = 'poll';
 
+include_lan_admin('poll');
 require_once(e_ADMIN."auth.php");
 require_once(e_PLUGIN."poll/poll_class.php");
 require_once(e_HANDLER."form_handler.php");
diff --git a/e107_plugins/poll/languages/English.php b/e107_plugins/poll/languages/English.php
index 41142bdd0..06dba59aa 100644
--- a/e107_plugins/poll/languages/English.php
+++ b/e107_plugins/poll/languages/English.php
@@ -11,30 +11,30 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/languages/English.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-11-08 20:40:28 $
+|     $Revision: 1.3 $
+|     $Date: 2008-08-16 16:25:45 $
 |     $Author: e107steved $
 +----------------------------------------------------------------------------+
 */
 
-define("POLL_ADLAN01", "Poll");
-define("POLL_ADLAN02", "The poll plugin allows you to define polls in either a menu or forum post.");
-define("POLL_ADLAN03", "Configure polls");
-define("POLL_ADLAN04", "The poll plugin has been successfully installed. To add polls, click on the Polls icon in the plugin section of your admin front page, and remember to activate the menu item from your menus page.");
+//define("POLL_ADLAN01", "Poll");
+//define("POLL_ADLAN02", "The poll plugin allows you to define polls in either a menu or forum post.");
+//define("POLL_ADLAN03", "Configure polls");
+//define("POLL_ADLAN04", "The poll plugin has been successfully installed. To add polls, click on the Polls icon in the plugin section of your admin front page, and remember to activate the menu item from your menus page.");
 
-define("POLL_ADLAN05", "Main Poll: ");
-define("POLL_ADLAN06", "Forum Thread: ");
-define("POLL_ADLAN07", "Type");
+//define("POLL_ADLAN05", "Main Poll: ");
+//define("POLL_ADLAN06", "Forum Thread: ");
+//define("POLL_ADLAN07", "Type");
 
 define("POLLAN_MENU_CAPTION", "Poll");
 
-define("POLLAN_1", "Existing polls");
-define("POLLAN_2", "Create / edit polls");
-define("POLLAN_3", "Poll question");
-define("POLLAN_4", "Options");
-define("POLLAN_5", "Edit");
-define("POLLAN_6", "Delete");
-define("POLLAN_7", "No polls yet.");
+//define("POLLAN_1", "Existing polls");
+//define("POLLAN_2", "Create / edit polls");
+//define("POLLAN_3", "Poll question");
+//define("POLLAN_4", "Options");
+//define("POLLAN_5", "Edit");
+//define("POLLAN_6", "Delete");
+//define("POLLAN_7", "No polls yet.");
 define("POLLAN_8", "Add another option");
 define("POLLAN_9", "Allow multiple choices?");
 define("POLLAN_10", "yes");
@@ -73,6 +73,6 @@ define("POLLAN_42", "This poll is restricted to administrators only");
 define("POLLAN_43", "You do not have the required permissions to vote in this poll");
 define("POLLAN_44", "Delete this poll?");
 define("POLLAN_45", "Poll successfully updated");
-define("POLLAN_46", "Field(s) left blank");
+//define("POLLAN_46", "Field(s) left blank");
 
 ?>
\ No newline at end of file
diff --git a/e107_plugins/poll/languages/admin/English.php b/e107_plugins/poll/languages/admin/English.php
new file mode 100644
index 000000000..f99703103
--- /dev/null
+++ b/e107_plugins/poll/languages/admin/English.php
@@ -0,0 +1,80 @@
+<?php
+/*
++ ----------------------------------------------------------------------------+
+|     e107 website system
+|
+|     ©Steve Dunstan 2001-2002
+|     http://e107.org
+|     jalist@e107.org
+|
+|     Released under the terms and conditions of the
+|     GNU General Public License (http://gnu.org).
+|
+|     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/languages/admin/English.php,v $
+|     $Revision: 1.1 $
+|     $Date: 2008-08-16 16:25:45 $
+|     $Author: e107steved $
++----------------------------------------------------------------------------+
+*/
+
+define("POLL_ADLAN01", "Poll");
+define("POLL_ADLAN02", "The poll plugin allows you to define polls in either a menu or forum post.");
+define("POLL_ADLAN03", "Configure polls");
+define("POLL_ADLAN04", "The poll plugin has been successfully installed. To add polls, click on the Polls icon in the plugin section of your admin front page, and remember to activate the menu item from your menus page.");
+
+define("POLL_ADLAN05", "Main Poll: ");
+define("POLL_ADLAN06", "Forum Thread: ");
+define("POLL_ADLAN07", "Type");
+
+define("POLLAN_MENU_CAPTION", "Poll");
+
+define("POLLAN_1", "Existing polls");
+define("POLLAN_2", "Create / edit polls");
+define("POLLAN_3", "Poll question");
+define("POLLAN_4", "Options");
+define("POLLAN_5", "Edit");
+define("POLLAN_6", "Delete");
+define("POLLAN_7", "No polls yet.");
+/*
+define("POLLAN_8", "Add another option");
+define("POLLAN_9", "Allow multiple choices?");
+define("POLLAN_10", "yes");
+define("POLLAN_11", "no");
+define("POLLAN_12", "Show results");
+define("POLLAN_13", "after voting");
+define("POLLAN_14", "by clicking view results link - comments must be turned on to use this option");
+define("POLLAN_15", "Allow to vote on this poll");
+define("POLLAN_16", "Vote storage method");
+define("POLLAN_17", "cookie");
+define("POLLAN_18", "IP address");
+define("POLLAN_19", "User ID (only members can vote)");
+define("POLLAN_20", "Allow comments to be posted to this poll?");
+define("POLLAN_21", "Preview again");
+define("POLLAN_22", "Update Poll");
+define("POLLAN_23", "Create Poll");
+define("POLLAN_24", "Preview");
+define("POLLAN_25", "Clear form");
+define("POLLAN_26", "votes");
+define("POLLAN_27", "Comments");
+define("POLLAN_28", "Previous polls");
+define("POLLAN_29", "posted by");
+define("POLLAN_30", "Submit");
+define("POLLAN_31", "Votes");
+define("POLLAN_32", "Click here to see results");
+define("POLLAN_33", "No previous polls yet.");
+define("POLLAN_34", "Title");
+define("POLLAN_35", "Posted by");
+define("POLLAN_36", "Active");
+define("POLLAN_37", "active from");
+define("POLLAN_38", "to");
+define("POLLAN_39", "Thank you for voting!");
+define("POLLAN_40", "Click here to see results");
+define("POLLAN_41", "This poll is restricted to members only");
+define("POLLAN_42", "This poll is restricted to administrators only");
+define("POLLAN_43", "You do not have the required permissions to vote in this poll");
+define("POLLAN_44", "Delete this poll?");
+define("POLLAN_45", "Poll successfully updated");
+*/
+define("POLLAN_46", "Field(s) left blank");
+
+?>
\ No newline at end of file
diff --git a/e107_plugins/poll/plugin.php b/e107_plugins/poll/plugin.php
deleted file mode 100644
index eb48ad268..000000000
--- a/e107_plugins/poll/plugin.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     ©Steve Dunstan 2001-2002
-|     http://e107.org
-|     jalist@e107.org
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/poll/plugin.php,v $
-|     $Revision: 1.1.1.1 $
-|     $Date: 2006-12-02 04:35:40 $
-|     $Author: mcfly_e107 $
-+----------------------------------------------------------------------------+
-*/
-
-if (!defined('e107_INIT')) { exit; }
-
-include_lan(e_PLUGIN."poll/languages/".e_LANGUAGE.".php");
-
-// Plugin info -------------------------------------------------------------------------------------------------------
-$eplug_name = POLL_ADLAN01;
-$eplug_version = "2.0";
-$eplug_author = "Steve Dunstan (jalist)";
-$eplug_url = "http://e107.org";
-$eplug_email = "jalist@e107.org";
-$eplug_description = POLL_ADLAN02;
-$eplug_compatible = "e107v0.7+";
-$eplug_readme = "";
-
-// Name of the plugin's folder -------------------------------------------------------------------------------------
-$eplug_folder = "poll";
-
-// Name of menu item for plugin ----------------------------------------------------------------------------------
-$eplug_menu_name = "poll_menu";
-
-// Name of the admin configuration file --------------------------------------------------------------------------
-$eplug_conffile = "admin_config.php";
-
-
-// Icon image and caption text ------------------------------------------------------------------------------------
-$eplug_icon = $eplug_folder."/images/polls_32.png";
-$eplug_icon_small = $eplug_folder."/images/polls_16.png";
-$eplug_caption = POLL_ADLAN03;
-
-// List of preferences -----------------------------------------------------------------------------------------------
-$eplug_prefs = array();
-
-// List of table names -----------------------------------------------------------------------------------------------
-$eplug_table_names = array("polls");
-
-// List of comment_type ids used by this plugin. -----------------------------
-$eplug_comment_ids = array(4);
-
-// List of sql requests to create tables -----------------------------------------------------------------------------
-$eplug_tables = array(
-"CREATE TABLE ".MPREFIX."polls (
-  poll_id int(10) unsigned NOT NULL auto_increment,
-  poll_datestamp int(10) unsigned NOT NULL default '0',
-  poll_start_datestamp int(10) unsigned NOT NULL default '0',
-  poll_end_datestamp int(10) unsigned NOT NULL default '0',
-  poll_admin_id int(10) unsigned NOT NULL default '0',
-  poll_title varchar(250) NOT NULL default '',
-  poll_options text NOT NULL,
-  poll_votes text NOT NULL,
-  poll_ip text NOT NULL,
-  poll_type tinyint(1) unsigned NOT NULL default '0',
-  poll_comment tinyint(1) unsigned NOT NULL default '1',
-  poll_allow_multiple tinyint(1) unsigned NOT NULL default '0',
-  poll_result_type tinyint(2) unsigned NOT NULL default '0',
-  poll_vote_userclass tinyint(3) unsigned NOT NULL default '0',
-  poll_storage_method tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (poll_id)
-) TYPE=MyISAM;");
-
-// Create a link in main menu (yes=TRUE, no=FALSE) -------------------------------------------------------------
-$eplug_link = FALSE;
-$eplug_link_name = "";
-$eplug_link_url = "";
-
-// Text to display after plugin successfully installed ------------------------------------------------------------------
-$eplug_done = POLL_ADLAN04;
-
-?>
diff --git a/e107_plugins/poll/plugin.xml b/e107_plugins/poll/plugin.xml
new file mode 100644
index 000000000..90fb8ba42
--- /dev/null
+++ b/e107_plugins/poll/plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<e107Plugin>
+<!-- $Id: plugin.xml,v 1.1 2008-08-16 16:25:45 e107steved Exp $ -->
+	<name>POLL_ADLAN01</name>
+	<version>2.0</version>
+	<author>Steve Dunstan (jalist)</author>
+	<authorUrl>http://e107.org</authorUrl>
+	<description>POLL_ADLAN02</description>
+	<compatibility>0.8</compatibility>
+	<installRequired>true</installRequired>
+	<folder>poll</folder>
+	<commentID>poll</commentID>
+	<administration>
+		<configFile>admin_config.php</configFile>
+		<icon>images/polls_32.png</icon>
+		<iconSmall>images/polls_16.png</iconSmall>
+		<caption>POLL_ADLAN03</caption>
+		<installDone>POLL_ADLAN04</installDone>
+	</administration>
+	<mainPrefs>
+	</mainPrefs>
+</e107Plugin>
\ No newline at end of file