diff --git a/source/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini b/source/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini
index b1b7e56..a3e77ca 100644
--- a/source/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini
+++ b/source/administrator/components/com_jedchecker/language/en-GB/en-GB.com_jedchecker.ini
@@ -70,3 +70,8 @@ COM_JEDCHECKER_RULE_JAMSS_DESC="JAMSS will raise many flags for use of potential
 COM_JEDCHECKER_ERROR_JAMSS_SUSPICIOUS_FILENAME="Suspicious filename found :"
 COM_JEDCHECKER_ERROR_JAMSS_CANNOT_OPEN="Could not check"
 COM_JEDCHECKER_ERROR_JAMSS_PATTERN="Pattern found"
+COM_JEDCHECKER_RULE_US1="Update Server Requirement"
+COM_JEDCHECKER_RULE_US1_DESC="The use of Update Servers is now required by JED."
+COM_JEDCHECKER_ERROR_XML_UPDATE_SERVER_NOT_FOUND="Update Server tag missing or incorrect in this XML file"
+COM_JEDCHECKER_ERROR_XML_UPDATE_SERVER_LINK_NOT_FOUND="Update Server link not found in this XML file"
+COM_JEDCHECKER_INFO_XML_UPDATE_SERVER_LINK="The Update Server link in this XML file is: %s"
diff --git a/source/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php b/source/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php
new file mode 100644
index 0000000..bbf70b8
--- /dev/null
+++ b/source/administrator/components/com_jedchecker/libraries/rules/xmlupdateserver.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * @author     eaxs <support@projectfork.net>
+ * @author     Daniel Dimitrov <daniel@compojoom.com>
+ * @date       07/06/2012
+ * @copyright  Copyright (C) 2008 - 2012 compojoom.com . All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die('Restricted access');
+
+// Include the rule base class
+require_once JPATH_COMPONENT_ADMINISTRATOR . '/models/rule.php';
+
+/**
+ * class JedcheckerRulesXMLUpdateServer
+ *
+ * This class searches all xml files for valid Update Servers
+ *
+ * @since  1.0
+ */
+class JedcheckerRulesXMLUpdateServer extends JEDcheckerRule
+{
+	/**
+	 * The formal ID of this rule. For example: SE1.
+	 *
+	 * @var    string
+	 */
+	protected $id = 'US1';
+
+	/**
+	 * The title or caption of this rule.
+	 *
+	 * @var    string
+	 */
+	protected $title = 'COM_JEDCHECKER_RULE_US1';
+
+	/**
+	 * The description of this rule.
+	 *
+	 * @var    string
+	 */
+	protected $description = 'COM_JEDCHECKER_RULE_US1_DESC';
+
+	/**
+	 * Initiates the search and check
+	 *
+	 * @return    void
+	 */
+	public function check()
+	{
+		// Find all XML files of the extension
+		$files = JFolder::files($this->basedir, '.xml$', true, true);
+
+		// Iterate through all the xml files
+		foreach ($files as $file)
+		{
+			// Try to find the license
+			$this->find($file);
+		}
+	}
+
+	/**
+	 * Reads a file and searches for the license
+	 *
+	 * @param   string  $file  - The path to the file
+	 *
+	 * @return boolean True if the license was found, otherwise False.
+	 */
+	protected function find($file)
+	{
+		$xml = JFactory::getXml($file);
+
+		// Failed to parse the xml file.
+		// Assume that this is not a extension manifest
+		if (!$xml)
+		{
+			return true;
+		}
+
+		// Check if this is an extension manifest
+		// 1.5 uses 'install', 1.6 uses 'extension'
+		if ($xml->getName() != 'install' && $xml->getName() != 'extension')
+		{
+			return true;
+		}
+
+		// Check if there is an updateservers tag
+		if (!isset($xml->updateservers))
+		{
+			$this->report->addError($file, JText::_('COM_JEDCHECKER_ERROR_XML_UPDATE_SERVER_NOT_FOUND'));
+
+			return false;
+		}
+		
+		// Check if server tag(s) exist
+		if (!isset($xml->updateservers->server))
+		{
+			$this->report->addError($file, JText::_('COM_JEDCHECKER_ERROR_XML_UPDATE_SERVER_NOT_FOUND'));
+
+			return false;
+			
+		} 
+		
+		// Check if server tag(s) contain valid links
+		foreach ($xml->updateservers->server as $server)
+		{
+			if (stripos($server, 'http') === false)
+			{
+				$this->report->addError($file, JText::_('COM_JEDCHECKER_ERROR_XML_UPDATE_SERVER_LINK_NOT_FOUND'));
+
+				return false;
+				
+			} else {
+				$this->report->addInfo($file, JText::sprintf('COM_JEDCHECKER_INFO_XML_UPDATE_SERVER_LINK', (string) $server));
+			}
+		}
+
+
+		// All checks passed. Return true
+		return true;
+	}
+}