diff --git a/e107_plugins/forum/plugin.xml b/e107_plugins/forum/plugin.xml
index 1f6312158..8983415ad 100755
--- a/e107_plugins/forum/plugin.xml
+++ b/e107_plugins/forum/plugin.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<e107Plugin>
-	<name>Forum</name>
-	<version>2.0</version>
-	<author>e107dev</author>
-	<authorUrl>http://e107.org</authorUrl>
+<!-- $Id: plugin.xml,v 1.13 2008-12-04 12:49:30 mcfly_e107 Exp $ -->
+<e107Plugin name="Forum" version="2.0" compatibility="0.8" installRequired="true">
+	<author name="e107dev" url="http://e107.org"/>
 	<description>This plugin is a fully featured Forum system</description>
-	<compatibility>0.8</compatibility>
-	<installRequired>true</installRequired>
 	<folder>forum</folder>
 	<administration>
 		<configFile>forum_admin.php</configFile>
diff --git a/e107_plugins/pm/plugin.xml b/e107_plugins/pm/plugin.xml
index 22a3654da..b56f22235 100755
--- a/e107_plugins/pm/plugin.xml
+++ b/e107_plugins/pm/plugin.xml
@@ -1,22 +1,18 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<e107Plugin>
-	<name>{ADLAN_PM}</name>
-	<version>3.0</version>
-	<author>McFly</author>
-	<authorEmail>mcfly@e107.org</authorEmail>
-	<description>{ADLAN_PM_57}</description>
-	<compatibility>0.8</compatibility>
-	<installRequired>true</installRequired>
-	<folder>pm</folder>
-	<administration>
-		<configFile>pm_conf.php</configFile>
-		<icon>images/pvt_message_32.png</icon>
-		<iconSmall>images/pvt_message_16.png</iconSmall>
-		<caption>{ADLAN_PM_2}</caption>
-	</administration>
-	<management>
-		<install type="fileFunction" file="pm_install.php" function="forum_install" />
-		<uninstall type="fileFunction" file="pm_uninstall.php" function="forum_uninstall" />
-		<upgrade type="fileFunction" file="pm_uninstall" function="forum_upgrade" />
-	</management>
-</e107Plugin>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Id: plugin.xml,v 1.3 2008-12-04 12:49:30 mcfly_e107 Exp $ -->
+<e107Plugin name="{ADLAN_PM}" version="3.0" compatibility="0.8" installRequired="true">
+	<author name="McFly" email="mcfly@e107.org"/>
+	<description>{ADLAN_PM_57}</description>
+	<folder>pm</folder>
+	<administration>
+		<configFile>pm_conf.php</configFile>
+		<icon>images/pvt_message_32.png</icon>
+		<iconSmall>images/pvt_message_16.png</iconSmall>
+		<caption>{ADLAN_PM_2}</caption>
+	</administration>
+	<management>
+		<install type="fileFunction" file="pm_install.php" function="forum_install" />
+		<uninstall type="fileFunction" file="pm_uninstall.php" function="forum_uninstall" />
+		<upgrade type="fileFunction" file="pm_uninstall" function="forum_upgrade" />
+	</management>
+</e107Plugin>
diff --git a/e107_plugins/poll/plugin.xml b/e107_plugins/poll/plugin.xml
index db12fe630..3d5526aaa 100644
--- a/e107_plugins/poll/plugin.xml
+++ b/e107_plugins/poll/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: plugin.xml,v 1.3 2008-12-03 22:29:58 e107steved Exp $ -->
+<!-- $Id: plugin.xml,v 1.4 2008-12-04 12:49:30 mcfly_e107 Exp $ -->
 <e107Plugin name="POLL_ADLAN01" version="2.0" compatibility="0.8" installRequired="true" >
-	<author="Steve Dunstan (jalist)" url="http://e107.org" />
+	<author name="Steve Dunstan (jalist)" url="http://e107.org" />
 	<description>POLL_ADLAN02</description>
 	<folder>poll</folder>
 	<logLanguageFile filename="languages/admin/--LAN--.php" />