diff --git a/administrator/components/com_menus/models/menus.php b/administrator/components/com_menus/models/menus.php
index 7404ce9f6ce58..e75c20ee66987 100644
--- a/administrator/components/com_menus/models/menus.php
+++ b/administrator/components/com_menus/models/menus.php
@@ -1,8 +1,10 @@
 <?php
 /**
- * @version		$Id$
  * @copyright	Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
  */
 
 // no direct access
@@ -13,22 +15,24 @@
 /**
  * Menu List Model for Menus.
  *
- * @package		Joomla.Administrator
- * @subpackage	com_menus
- * @since		1.6
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ * @since       1.6
  */
 class MenusModelMenus extends JModelList
 {
 	/**
 	 * Constructor.
 	 *
-	 * @param	array	An optional associative array of configuration settings.
+	 * @param   array	An optional associative array of configuration settings.
+	 *
 	 * @see		JController
-	 * @since	1.6
+	 * @since   1.6
 	 */
 	public function __construct($config = array())
 	{
-		if (empty($config['filter_fields'])) {
+		if (empty($config['filter_fields']))
+		{
 			$config['filter_fields'] = array(
 				'id', 'a.id',
 				'title', 'a.title',
@@ -42,8 +46,9 @@ public function __construct($config = array())
 	/**
 	 * Overrides the getItems method to attach additional metrics to the list.
 	 *
-	 * @return	mixed	An array of data items on success, false on failure.
-	 * @since	1.6.1
+	 * @return  mixed  An array of data items on success, false on failure.
+	 *
+	 * @since   1.6.1
 	 */
 	public function getItems()
 	{
@@ -51,7 +56,8 @@ public function getItems()
 		$store = $this->getStoreId('getItems');
 
 		// Try to load the data from internal storage.
-		if (!empty($this->cache[$store])) {
+		if (!empty($this->cache[$store]))
+		{
 			return $this->cache[$store];
 		}
 
@@ -59,7 +65,8 @@ public function getItems()
 		$items = parent::getItems();
 
 		// If emtpy or an error, just return.
-		if (empty($items)) {
+		if (empty($items))
+		{
 			return array();
 		}
 
@@ -87,7 +94,8 @@ public function getItems()
 		$db->setQuery($query);
 		$countPublished = $db->loadAssocList('menutype', 'count_published');
 
-		if ($db->getErrorNum()) {
+		if ($db->getErrorNum())
+		{
 			$this->setError($db->getErrorMsg());
 			return false;
 		}
@@ -95,12 +103,12 @@ public function getItems()
 		// Get the unpublished menu counts.
 		$query->clear('where')
 			->where('m.published = 0')
-			->where('m.menutype IN ('.$menuTypes.')')
-			;
+			->where('m.menutype IN ('.$menuTypes.')');
 		$db->setQuery($query);
 		$countUnpublished = $db->loadAssocList('menutype', 'count_published');
 
-		if ($db->getErrorNum()) {
+		if ($db->getErrorNum())
+		{
 			$this->setError($db->getErrorMsg());
 			return false;
 		}
@@ -108,12 +116,12 @@ public function getItems()
 		// Get the trashed menu counts.
 		$query->clear('where')
 			->where('m.published = -2')
-			->where('m.menutype IN ('.$menuTypes.')')
-			;
+			->where('m.menutype IN ('.$menuTypes.')');
 		$db->setQuery($query);
 		$countTrashed = $db->loadAssocList('menutype', 'count_published');
 
-		if ($db->getErrorNum()) {
+		if ($db->getErrorNum())
+		{
 			$this->setError($db->getErrorMsg());
 			return false;
 		}
@@ -121,9 +129,9 @@ public function getItems()
 		// Inject the values back into the array.
 		foreach ($items as $item)
 		{
-			$item->count_published		= isset($countPublished[$item->menutype]) ? $countPublished[$item->menutype] : 0;
-			$item->count_unpublished	= isset($countUnpublished[$item->menutype]) ? $countUnpublished[$item->menutype] : 0;
-			$item->count_trashed		= isset($countTrashed[$item->menutype]) ? $countTrashed[$item->menutype] : 0;
+			$item->count_published = isset($countPublished[$item->menutype]) ? $countPublished[$item->menutype] : 0;
+			$item->count_unpublished = isset($countUnpublished[$item->menutype]) ? $countUnpublished[$item->menutype] : 0;
+			$item->count_trashed = isset($countTrashed[$item->menutype]) ? $countTrashed[$item->menutype] : 0;
 		}
 
 		// Add the items to the internal cache.
@@ -135,7 +143,9 @@ public function getItems()
 	/**
 	 * Method to build an SQL query to load the list data.
 	 *
-	 * @return	string	An SQL query
+	 * @return  string  An SQL query
+	 *
+	 * @since   1.6
 	 */
 	protected function getListQuery()
 	{
@@ -161,7 +171,12 @@ protected function getListQuery()
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
-	 * @since	1.6
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
@@ -172,12 +187,34 @@ protected function populateState($ordering = null, $direction = null)
 		parent::populateState('a.id', 'asc');
 	}
 
+	/**
+	 * Gets the extension id of the core mod_menu module.
+	 *
+	 * @return  integer
+	 *
+	 * @since   2.5
+	 */
+	public function getModMenuId()
+	{
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('e.extension_id')
+			->from('#__extensions AS e')
+			->where('e.type = ' . $db->quote('module'))
+			->where('e.element = ' . $db->quote('mod_menu'))
+			->where('e.client_id = 0');
+		$db->setQuery($query);
+
+		return $db->loadResult();
+	}
+
 	/**
 	 * Gets a list of all mod_mainmenu modules and collates them by menutype
 	 *
-	 * @return	array
+	 * @return  array
 	 */
-	function &getModules()
+	public function &getModules()
 	{
 		$model	= JModel::getInstance('Menu', 'MenusModel', array('ignore_request' => true));
 		$result	= &$model->getModules();
diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php
index c2f84cfd60659..67bf1bb698f84 100644
--- a/administrator/components/com_menus/views/menus/tmpl/default.php
+++ b/administrator/components/com_menus/views/menus/tmpl/default.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @version		$Id$
- * @package		Joomla.Administrator
- * @subpackage	com_menus
- * @copyright	Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
- * @license		GNU General Public License version 2 or later; see LICENSE.txt
+ * @package     Joomla.Administrator
+ * @subpackage  com_menus
+ *
+ * @copyright   Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
@@ -16,12 +16,13 @@
 JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 
-$uri		= JFactory::getUri();
-$return		= base64_encode($uri);
-$user		= JFactory::getUser();
-$userId		= $user->get('id');
-$listOrder	= $this->escape($this->state->get('list.ordering'));
-$listDirn	= $this->escape($this->state->get('list.direction'));
+$uri = JFactory::getUri();
+$return = base64_encode($uri);
+$user = JFactory::getUser();
+$userId = $user->get('id');
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+$modMenuId = (int) $this->get('ModMenuId');
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task) {
@@ -104,11 +105,9 @@
 						<?php echo $item->count_trashed; ?></a>
 				</td>
 				<td class="left">
-				<ul>
-					<?php
-					if (isset($this->modules[$item->menutype])) :
-						foreach ($this->modules[$item->menutype] as &$module) :
-						?>
+					<?php if (isset($this->modules[$item->menutype])) : ?>
+					<ul>
+						<?php foreach ($this->modules[$item->menutype] as &$module) : ?>
 						<li>
 							<?php if ($canEdit) : ?>
 								<a class="modal" href="<?php echo JRoute::_('index.php?option=com_modules&task=module.edit&id='.$module->id.'&return='.$return.'&tmpl=component&layout=modal');?>" rel="{handler: 'iframe', size: {x: 1024, y: 450}, onClose: function() {window.location.reload()}}"  title="<?php echo JText::_('COM_MENUS_EDIT_MODULE_SETTINGS');?>">
@@ -117,11 +116,12 @@
 								<?php echo JText::sprintf('COM_MENUS_MODULE_ACCESS_POSITION', $this->escape($module->title), $this->escape($module->access_title), $this->escape($module->position)); ?>
 							<?php endif; ?>
 						</li>
-						<?php
-						endforeach;
-					endif;
-					?>
-				</ul>
+						<?php endforeach; ?>
+					</ul>
+					<?php elseif ($modMenuId) : ?>
+					<a href="<?php echo JRoute::_('index.php?option=com_modules&task=module.add&eid=' . $modMenuId . '&params[menutype]='.$item->menutype); ?>">
+						<?php echo JText::_('COM_MENUS_ADD_MENU_MODULE'); ?></a>
+					<?php endif; ?>
 				</td>
 				<td class="center">
 					<?php echo $item->id; ?>
diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php
index 010df8e8c4e84..e6776702d489d 100644
--- a/administrator/components/com_modules/controllers/module.php
+++ b/administrator/components/com_modules/controllers/module.php
@@ -1,6 +1,8 @@
 <?php
 /**
- * @version		$Id$
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ *
  * @copyright	Copyright (C) 2005 - 2011 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
@@ -13,14 +15,18 @@
 /**
  * Module controller class.
  *
- * @package		Joomla.Administrator
- * @subpackage	com_modules
- * @version		1.6
+ * @package     Joomla.Administrator
+ * @subpackage  com_modules
+ * @version     1.6
  */
 class ModulesControllerModule extends JControllerForm
 {
 	/**
 	 * Override parent add method.
+	 *
+	 * @return  mixed  True if the record can be added, a JError object if not.
+	 *
+	 * @since   1.6
 	 */
 	public function add()
 	{
@@ -29,35 +35,60 @@ public function add()
 
 		// Get the result of the parent method. If an error, just return it.
 		$result = parent::add();
-		if ($result instanceof Exception) {
+		if ($result instanceof Exception)
+		{
 			return $result;
 		}
 
 		// Look for the Extension ID.
-		$extensionId = JRequest::getInt('eid');
-		if (empty($extensionId)) {
+		$extensionId = $app->input->get('eid', 0, 'int');
+		if (empty($extensionId))
+		{
 			$this->setRedirect(JRoute::_('index.php?option='.$this->option.'&view='.$this->view_item.'&layout=edit', false));
 			return JError::raiseWarning(500, JText::_('COM_MODULES_ERROR_INVALID_EXTENSION'));
 		}
 
 		$app->setUserState('com_modules.add.module.extension_id', $extensionId);
+		$app->setUserState('com_modules.add.module.params', null);
+
+		// Parameters could be coming in for a new item, so let's set them.
+		$params = $app->input->get('params', array(), 'array');
+		$app->setUserState('com_modules.add.module.params', $params);
 	}
 
 	/**
 	 * Override parent cancel method to reset the add module state.
+	 *
+	 * @param   string  $key  The name of the primary key of the URL variable.
+	 *
+	 * @return  boolean  True if access level checks pass, false otherwise.
+	 *
+	 * @since   11.1
 	 */
 	public function cancel($key = null)
 	{
 		// Initialise variables.
 		$app = JFactory::getApplication();
 
-		parent::cancel();
+		$result = parent::cancel();
 
 		$app->setUserState('com_modules.add.module.extension_id', null);
+		$app->setUserState('com_modules.add.module.params', null);
+
+		return $result;
 	}
 
 	/**
 	 * Override parent allowSave method.
+	 *
+	 * Extended classes can override this if necessary.
+	 *
+	 * @param   array   $data  An array of input data.
+	 * @param   string  $key   The name of the key for the primary key.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   1.6
 	 */
 	protected function allowSave($data, $key = 'id')
 	{
@@ -74,10 +105,11 @@ protected function allowSave($data, $key = 'id')
 	/**
 	 * Function that allows child controller access to model data after the data has been saved.
 	 *
-	 * @param	JModel	$model	The data model object.
+	 * @param   JModel  $model  The data model object.
 	 *
-	 * @return	void
-	 * @since	1.6
+	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	protected function postSaveHook(JModel &$model, $validData = array())
 	{
@@ -95,5 +127,7 @@ protected function postSaveHook(JModel &$model, $validData = array())
 				$app->setUserState('com_modules.add.module.extension_id', null);
 				break;
 		}
+
+		$app->setUserState('com_modules.add.module.params', null);
 	}
 }
diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
index 7a07b1384a97b..80a9b3f780aba 100644
--- a/administrator/components/com_modules/models/module.php
+++ b/administrator/components/com_modules/models/module.php
@@ -274,11 +274,21 @@ public function getForm($data = array(), $loadData = true)
 	 */
 	protected function loadFormData()
 	{
+		$app = JFactory::getApplication();
+
 		// Check the session for previously entered form data.
 		$data = JFactory::getApplication()->getUserState('com_modules.edit.module.data', array());
 
-		if (empty($data)) {
+		if (empty($data))
+		{
 			$data = $this->getItem();
+
+			// This allows us to inject parameter settings into a new module.
+			$params = $app->getUserState('com_modules.add.module.params');
+			if (is_array($params))
+			{
+				$data->set('params', $params);
+			}
 		}
 
 		return $data;
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index 35dc062765738..8ea448f760af7 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -4,7 +4,11 @@
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
+; %1$s is for module title, %2$s is for access-title, %3$s is for position
+; in the following string
+
 COM_MENUS="Menus Manager"
+COM_MENUS_ADD_MENU_MODULE="Add a module for this menu type."
 COM_MENUS_ADVANCED_FIELDSET_LABEL="Advanced Options"
 COM_MENUS_BASIC_FIELDSET_LABEL="Basic Options"
 COM_MENUS_BATCH_MENU_ITEM_CANNOT_CREATE="You are not allowed to create new menu items."
@@ -20,8 +24,8 @@ COM_MENUS_ERROR_ONE_HOME="Only one menu item can be a home link for each languag
 COM_MENUS_FIELD_FEEDLINK_DESC="Display a feed link for this menu item"
 COM_MENUS_FIELD_FEEDLINK_LABEL="Feed link"
 COM_MENUS_FIELD_VALUE_IGNORE="Ignore"
-COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
 COM_MENUS_FIELD_VALUE_NEW_WITHOUT_NAV="New Without Navigation"
+COM_MENUS_FIELD_VALUE_NEW_WITH_NAV="New Window With Navigation"
 COM_MENUS_FIELD_VALUE_PARENT="Parent"
 COM_MENUS_GRID_UNSET_LANGUAGE="Unset %s Default"
 COM_MENUS_HEADING_ASSIGN_MODULE="Module"
@@ -34,8 +38,15 @@ COM_MENUS_HEADING_PUBLISHED_ITEMS="# Published"
 COM_MENUS_HEADING_TRASHED_ITEMS="# Trashed"
 COM_MENUS_HEADING_UNPUBLISHED_ITEMS="# Unpublished"
 COM_MENUS_INTEGRATION_FIELDSET_LABEL="Integration Options"
-COM_MENUS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Menu Item Associations"
+COM_MENUS_ITEMS_REBUILD_FAILED="Failed rebuilding Menu Items list"
+COM_MENUS_ITEMS_REBUILD_SUCCESS="Menu items list successfully rebuilt"
+COM_MENUS_ITEMS_SEARCH_FILTER="Search title or alias. Prefix with id: to search for a menu id."
+COM_MENUS_ITEMS_SET_HOME_0="No menu item set to home"
+COM_MENUS_ITEMS_SET_HOME_1="One menu item successfully set to home"
+COM_MENUS_ITEMS_SET_HOME_MORE="%d menu items successfully set to home"
+COM_MENUS_ITEMS_UNSET_HOME="One menu item successfully unset to home"
 COM_MENUS_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilanguage only! This choice will only display if the Language Filter parameter 'Menu Associations' is set to 'Yes'. Choose a menu item for the target language. This association will let the Language Switcher module redirect to the associated menu item in another language. If used, make sure to display the Language switcher module on the concerned pages. A menu item set to language 'All' can't be associated."
+COM_MENUS_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Menu Item Associations"
 COM_MENUS_ITEM_DETAILS="Details"
 COM_MENUS_ITEM_FIELD_ALIAS_DESC="The alias is used in the URL when SEF is on"
 COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC="Menu Item to link to..."
@@ -86,13 +97,6 @@ COM_MENUS_ITEM_IS_DEFAULT="Is default"
 COM_MENUS_ITEM_MODULE_ASSIGNMENT="Module Assignment for this Menu Item"
 COM_MENUS_ITEM_REQUIRED="Required"
 COM_MENUS_ITEM_ROOT="Menu Item Root"
-COM_MENUS_ITEMS_REBUILD_FAILED="Failed rebuilding Menu Items list"
-COM_MENUS_ITEMS_REBUILD_SUCCESS="Menu items list successfully rebuilt"
-COM_MENUS_ITEMS_SEARCH_FILTER="Search title or alias. Prefix with id: to search for a menu id."
-COM_MENUS_ITEMS_SET_HOME_0="No menu item set to home"
-COM_MENUS_ITEMS_SET_HOME_1="One menu item successfully set to home"
-COM_MENUS_ITEMS_SET_HOME_MORE="%d menu items successfully set to home"
-COM_MENUS_ITEMS_UNSET_HOME="One menu item successfully unset to home"
 COM_MENUS_LAYOUT_FEATURED_OPTIONS="Layout Options"
 COM_MENUS_LAYOUT_MENUTYPE_OPTIONS_LABEL="Menu Type Options"
 COM_MENUS_LINKTYPE_OPTIONS_LABEL="Link Type Options"
@@ -102,15 +106,13 @@ COM_MENUS_MENU_DETAILS="Menu Details"
 COM_MENUS_MENU_ITEM_SAVE_SUCCESS="Menu item successfully saved"
 COM_MENUS_MENU_MENUTYPE_DESC="The system name of the menu."
 COM_MENUS_MENU_MENUTYPE_LABEL="Menu type"
-COM_MENUS_TYPE_SYSTEM="System Links"
 COM_MENUS_MENU_SAVE_SUCCESS="Menu successfully saved"
 COM_MENUS_MENU_TITLE_DESC="The title of the menu to display in the Administrator Menubar and lists."
 COM_MENUS_MENU_TYPE_NOT_ALLOWED="This is a reserved menutype."
-COM_MENUS_PAGE_OPTIONS_LABEL="Page Display Options"
-; in the following string
-; %1$s is for module title, %2$s is for access-title, %3$s is for position
 COM_MENUS_MODULE_ACCESS_POSITION="%1$s <small>(%2$s in %3$s)</small>"
 COM_MENUS_MODULE_SHOW_VARIES="Varies"
+COM_MENUS_NO_ITEM_SELECTED="No menu items selected"
+COM_MENUS_NO_MENUS_SELECTED="No menu selected"
 COM_MENUS_N_ITEMS_CHECKED_IN_0="No menu item successfully checked in"
 COM_MENUS_N_ITEMS_CHECKED_IN_1="%d menu item successfully checked in"
 COM_MENUS_N_ITEMS_CHECKED_IN_MORE="%d menu items successfully checked in"
@@ -124,17 +126,16 @@ COM_MENUS_N_ITEMS_UNPUBLISHED="%d menu items successfully unpublished"
 COM_MENUS_N_ITEMS_UNPUBLISHED_1="%d menu item successfully unpublished"
 COM_MENUS_N_MENUS_DELETED="%d menu types successfully deleted"
 COM_MENUS_N_MENUS_DELETED_1="Menu type successfully deleted"
-COM_MENUS_NO_ITEM_SELECTED="No menu items selected"
-COM_MENUS_NO_MENUS_SELECTED="No menu selected"
 COM_MENUS_OPTION_SELECT_LEVEL="- Select Max Levels -"
+COM_MENUS_PAGE_OPTIONS_LABEL="Page Display Options"
 COM_MENUS_REQUEST_FIELDSET_LABEL="Required Settings"
 COM_MENUS_SAVE_SUCCESS="Menu item successfully saved"
 COM_MENUS_SUBMENU_ITEMS="Menu Items"
 COM_MENUS_SUBMENU_MENUS="Menus"
 COM_MENUS_SUCCESS_REORDERED="Menu item successfully reordered"
 COM_MENUS_TIP_ALIAS_LABEL="<strong>Warning!</strong><br />Leave the alias field empty if the menu item alias and the menu item linked to by the alias have the same parent."
-COM_MENUS_TIP_ASSOCIATION="Associated menu items"
 COM_MENUS_TIP_ASSOCIATED_LANGUAGE="%s %s (%s)"
+COM_MENUS_TIP_ASSOCIATION="Associated menu items"
 COM_MENUS_TITLE_EDIT_ITEM="Menu Manager: Title Edit Item"
 COM_MENUS_TOOLBAR_SET_HOME="Home"
 COM_MENUS_TYPE_ALIAS="Menu Item Alias"
@@ -144,6 +145,7 @@ COM_MENUS_TYPE_EXTERNAL_URL="External URL"
 COM_MENUS_TYPE_EXTERNAL_URL_DESC="An external or internal URL."
 COM_MENUS_TYPE_SEPARATOR="Text Separator"
 COM_MENUS_TYPE_SEPARATOR_DESC="A text separator."
+COM_MENUS_TYPE_SYSTEM="System Links"
 COM_MENUS_TYPE_UNEXISTING="Component '%s' does not exist"
 COM_MENUS_TYPE_UNKNOWN="Unknown"
 COM_MENUS_VIEW_EDIT_ITEM_TITLE="Menu Manager: Edit Menu Item"