diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index d28274b13bf49..ecb7d1a0447d7 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -276,6 +276,31 @@ public static function iframe($url, $name, $attribs = null, $noFrames = '')
 		return '<iframe src="' . $url . '" ' . $attribs . ' name="' . $name . '">' . $noFrames . '</iframe>';
 	}
 
+	/**
+	 * Include version with MD5SUM file in path.
+	 *
+	 * @param   string  $path  Folder name to search into (images, css, js, ...).
+	 *
+	 * @return  string  Query string to add.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 *
+	 * @deprecated   4.0  Usage of MD5SUM files is deprecated, use version instead.
+	 */
+	protected static function getMd5Version($path)
+	{
+		$md5 = dirname($path) . '/MD5SUM';
+
+		if (file_exists($md5))
+		{
+			JLog::add('Usage of MD5SUM files is deprecated, use version instead.', JLog::WARNING, 'deprecated');
+
+			return '?' . file_get_contents($md5);
+		}
+
+		return '';
+	}
+
 	/**
 	 * Compute the files to be included
 	 *
@@ -371,9 +396,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 					if (file_exists($path))
 					{
-						$md5 = dirname($path) . '/MD5SUM';
-						$includes[] = JUri::base(true) . "/templates/$template/$folder/$file" .
-							(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+						$includes[] = JUri::base(true) . "/templates/$template/$folder/$file" . static::getMd5Version($path);
 
 						break;
 					}
@@ -396,9 +419,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/media/$extension/$element/$folder/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/media/$extension/$element/$folder/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -408,9 +429,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/media/$extension/$folder/$element/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/media/$extension/$folder/$element/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -420,9 +439,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/templates/$template/$folder/system/$element/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/templates/$template/$folder/system/$element/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -432,9 +449,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/media/system/$folder/$element/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/media/system/$folder/$element/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -446,9 +461,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/media/$extension/$folder/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/media/$extension/$folder/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -458,9 +471,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/templates/$template/$folder/system/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/templates/$template/$folder/system/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -470,9 +481,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 								if (file_exists($path))
 								{
-									$md5 = dirname($path) . '/MD5SUM';
-									$includes[] = JUri::root(true) . "/media/system/$folder/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+									$includes[] = JUri::root(true) . "/media/system/$folder/$file" . static::getMd5Version($path);
 
 									break;
 								}
@@ -485,9 +494,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 							if (file_exists($path))
 							{
-								$md5 = dirname($path) . '/MD5SUM';
-								$includes[] = JUri::root(true) . "/media/system/$folder/$file" .
-										(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+								$includes[] = JUri::root(true) . "/media/system/$folder/$file" . static::getMd5Version($path);
 
 								break;
 							}
@@ -535,9 +542,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 
 					if (file_exists($path))
 					{
-						$md5 = dirname($path) . '/MD5SUM';
-						$includes[] = JUri::root(true) . "/$file" .
-							(file_exists($md5) ? ('?' . file_get_contents($md5)) : '');
+						$includes[] = JUri::root(true) . "/$file" . static::getMd5Version($path);
 
 						break;
 					}
@@ -653,50 +658,83 @@ public static function stylesheet($file, $attribs = array(), $relative = false,
 	/**
 	 * Write a `<script>` element to load a JavaScript file
 	 *
-	 * @param   string   $file            Path to file
-	 * @param   boolean  $framework       Flag to determine if the MooTools framework should be loaded.
-	 * @param   boolean  $relative        Flag if the path to the file is relative to the /media folder (and searches in template).
-	 * @param   boolean  $returnPath      Flag if the file path should be returned or if the file should be included in the global JDocument instance
-	 * @param   boolean  $detect_browser  Flag if the browser should be detected to include specific browser files.
-	 * @param   boolean  $detect_debug    Flag if debug mode is enabled to include uncompressed files if debug is on.
+	 * @param   string  $file     Path to file.
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
 	 *
-	 * @return  array|string|null  nothing if $returnPath is false, null, path or array of path if specific JavaScript browser files were detected
+	 * @return  array|string|null  Nothing if $returnPath is false, null, path or array of path if specific JavaScript browser files were detected
 	 *
 	 * @see     JHtml::stylesheet()
 	 * @since   1.5
+	 * @deprecated 4.0  The (file, framework, relative, pathOnly, detectBrowser, detectDebug) method signature is deprecated,
+	 *                  use (file, options, attributes) instead.
 	 */
-	public static function script($file, $framework = false, $relative = false, $returnPath = false, $detect_browser = true, $detect_debug = true)
+	public static function script($file, $options = array(), $attribs = array())
 	{
+		// B/C before __DEPLOY_VERSION__
+		if (!is_array($options) && !is_array($attribs))
+		{
+			JLog::add('The script method signature used has changed, use (file, options, attributes) instead.', JLog::WARNING, 'deprecated');
+
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old parameters.
+			$options['framework']     = isset($argList[1]) ? $argList[1] : false;
+			$options['relative']      = isset($argList[2]) ? $argList[2] : false;
+			$options['pathOnly']      = isset($argList[3]) ? $argList[3] : false;
+			$options['detectBrowser'] = isset($argList[4]) ? $argList[4] : true;
+			$options['detectDebug']   = isset($argList[5]) ? $argList[5] : true;
+		}
+		else
+		{
+			$options['framework']     = isset($options['framework']) ? $options['framework'] : false;
+			$options['relative']      = isset($options['relative']) ? $options['relative'] : false;
+			$options['pathOnly']      = isset($options['pathOnly']) ? $options['pathOnly'] : false;
+			$options['detectBrowser'] = isset($options['detectBrowser']) ? $options['detectBrowser'] : true;
+			$options['detectDebug']   = isset($options['detectDebug']) ? $options['detectDebug'] : true;
+		}
+
 		// Include MooTools framework
-		if ($framework)
+		if ($options['framework'])
 		{
 			static::_('behavior.framework');
 		}
 
-		$includes = static::includeRelativeFiles('js', $file, $relative, $detect_browser, $detect_debug);
+		$includes = static::includeRelativeFiles('js', $file, $options['relative'], $options['detectBrowser'], $options['detectDebug']);
 
 		// If only path is required
-		if ($returnPath)
+		if ($options['pathOnly'])
 		{
 			if (count($includes) == 0)
 			{
 				return;
 			}
-
-			if (count($includes) == 1)
+			elseif (count($includes) == 1)
 			{
 				return $includes[0];
 			}
-
-			return $includes;
+			else
+			{
+				return $includes;
+			}
 		}
-
 		// If inclusion is required
-		$document = JFactory::getDocument();
-
-		foreach ($includes as $include)
+		else
 		{
-			$document->addScript($include);
+			$document = JFactory::getDocument();
+
+			foreach ($includes as $include)
+			{
+				// If there is already a version hash in the script reference (by using deprecated MD5SUM).
+				if ($pos = strpos($include, '?') !== false)
+				{
+					$options['version'] = substr($include, $pos + 1);
+				}
+
+				$document->addScript($include, $options, $attribs);
+			}
 		}
 	}
 
diff --git a/libraries/joomla/document/document.php b/libraries/joomla/document/document.php
index 953a6057386be..3703d05fac356 100644
--- a/libraries/joomla/document/document.php
+++ b/libraries/joomla/document/document.php
@@ -447,20 +447,47 @@ public function setMetaData($name, $content, $attribute = 'name')
 	/**
 	 * Adds a linked script to the page
 	 *
-	 * @param   string   $url    URL to the linked script
-	 * @param   string   $type   Type of script. Defaults to 'text/javascript'
-	 * @param   boolean  $defer  Adds the defer attribute.
-	 * @param   boolean  $async  Adds the async attribute.
+	 * @param   string  $url      URL to the linked script.
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
 	 *
 	 * @return  JDocument instance of $this to allow chaining
 	 *
 	 * @since   11.1
+	 * @deprecated 4.0  The (url, mime, defer, async) method signature is deprecated, use (url, options, attributes) instead.
 	 */
-	public function addScript($url, $type = "text/javascript", $defer = false, $async = false)
+	public function addScript($url, $options = array(), $attribs = array())
 	{
-		$this->_scripts[$url]['mime'] = $type;
-		$this->_scripts[$url]['defer'] = $defer;
-		$this->_scripts[$url]['async'] = $async;
+		// B/C before __DEPLOY_VERSION__
+		if (!is_array($options) && !is_array($attribs))
+		{
+			JLog::add('The addScript method signature used has changed, use (url, options, attributes) instead.', JLog::WARNING, 'deprecated');
+
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
+
+			// Old mime type parameter.
+			if (!empty($argList[1]))
+			{
+				$attribs['mime'] = $argList[1];
+			}
+
+			// Old defer parameter.
+			if (isset($argList[2]) && $argList[2])
+			{
+				$attribs['defer'] = true;
+			}
+
+			// Old async parameter.
+			if (isset($argList[3]) && $argList[3])
+			{
+				$attribs['async'] = true;
+			}
+		}
+
+		$this->_scripts[$url]            = isset($this->_scripts[$url]) ? array_replace($this->_scripts[$url], $attribs) : $attribs;
+		$this->_scripts[$url]['options'] = isset($this->_scripts[$url]['options']) ? array_replace($this->_scripts[$url]['options'], $options) : $options;
 
 		return $this;
 	}
@@ -469,30 +496,54 @@ public function addScript($url, $type = "text/javascript", $defer = false, $asyn
 	 * Adds a linked script to the page with a version to allow to flush it. Ex: myscript.js?54771616b5bceae9df03c6173babf11d
 	 * If not specified Joomla! automatically handles versioning
 	 *
-	 * @param   string   $url      URL to the linked script
-	 * @param   string   $version  Version of the script
-	 * @param   string   $type     Type of script. Defaults to 'text/javascript'
-	 * @param   boolean  $defer    Adds the defer attribute.
-	 * @param   boolean  $async    [description]
+	 * @param   string  $url      URL to the linked script.
+	 * @param   array   $options  Array of options. Example: array('version' => 'auto', 'conditional' => 'lt IE 9')
+	 * @param   array   $attribs  Array of attributes. Example: array('id' => 'scriptid', 'async' => 'async', 'data-test' => 1)
 	 *
 	 * @return  JDocument instance of $this to allow chaining
 	 *
 	 * @since   3.2
+	 * @deprecated 4.0  This method is deprecated, use addScript(url, options, attributes) instead.
 	 */
-	public function addScriptVersion($url, $version = null, $type = "text/javascript", $defer = false, $async = false)
+	public function addScriptVersion($url, $options = array(), $attribs = array())
 	{
-		// Automatic version
-		if ($version === null)
+		JLog::add('The method is deprecated, use addScript(url, attributes, options) instead.', JLog::WARNING, 'deprecated');
+
+		// B/C before __DEPLOY_VERSION__
+		if (!is_array($options) && !is_array($attribs))
 		{
-			$version = $this->getMediaVersion();
-		}
+			$argList = func_get_args();
+			$options = array();
+			$attribs = array();
 
-		if (!empty($version) && strpos($url, '?') === false)
+			// Old version parameter.
+			$options['version'] = isset($argList[1]) && !is_null($argList[1]) ? $argList[1] : 'auto';
+
+			// Old mime type parameter.
+			if (!empty($argList[2]))
+			{
+				$attribs['mime'] = $argList[2];
+			}
+
+			// Old defer parameter.
+			if (isset($argList[3]) && $argList[3])
+			{
+				$attribs['defer'] = true;
+			}
+
+			// Old async parameter.
+			if (isset($argList[4]) && $argList[4])
+			{
+				$attribs['async'] = true;
+			}
+		}
+		// Default value for version.
+		else
 		{
-			$url .= '?' . $version;
+			$options['version'] = 'auto';
 		}
 
-		return $this->addScript($url, $type, $defer, $async);
+		return $this->addScript($url, $options, $attribs);
 	}
 
 	/**
diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/joomla/document/renderer/html/head.php
index 1a7db8da20602..224fd2548716b 100644
--- a/libraries/joomla/document/renderer/html/head.php
+++ b/libraries/joomla/document/renderer/html/head.php
@@ -204,39 +204,79 @@ public function fetchHead($document)
 			$buffer .= '</script>' . $lnEnd;
 		}
 
-		$defaultJsMimes = array('text/javascript', 'application/javascript', 'text/x-javascript', 'application/x-javascript');
+		$defaultJsMimes         = array('text/javascript', 'application/javascript', 'text/x-javascript', 'application/x-javascript');
+		$html5NoValueAttributes = array('defer', 'async');
+		$mediaVersion           = $document->getMediaVersion();
 
 		// Generate script file links
-		foreach ($document->_scripts as $strSrc => $strAttr)
+		foreach ($document->_scripts as $src => $attribs)
 		{
-			$buffer .= $tab . '<script src="' . $strSrc . '"';
+			// Check if script uses IE conditional statements.
+			$conditional = isset($attribs['options']) && isset($attribs['options']['conditional']) ? $attribs['options']['conditional'] : null;
 
-			if (!is_null($strAttr['mime']) && (!$document->isHtml5() || !in_array($strAttr['mime'], $defaultJsMimes)))
+			// Check if script uses media version.
+			if (strpos($src, '?') === false && isset($attribs['options']) && isset($attribs['options']['version']) && $attribs['options']['version'])
 			{
-				$buffer .= ' type="' . $strAttr['mime'] . '"';
+				$src .= '?' . ($attribs['options']['version'] === 'auto' ? $mediaVersion : $attribs['options']['version']);
+			}
+
+			$buffer .= $tab;
+
+			// This is for IE conditional statements support.
+			if (!is_null($conditional))
+			{
+				$buffer .= '<!--[if ' . $conditional . ']>';
 			}
 
-			if ($strAttr['defer'])
+			$buffer .= '<script src="' . $src . '"';
+
+			// Add script tag attributes.
+			foreach ($attribs as $attrib => $value)
 			{
-				$buffer .= ' defer';
+				// Don't add the 'options' attribute. This attribute is for internal use (version, conditional, etc).
+				if ($attrib === 'options')
+				{
+					continue;
+				}
 
-				if (!$document->isHtml5())
+				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
+				if (in_array($attrib, array('type', 'mime')) && $document->isHtml5() && in_array($value, $defaultJsMimes))
 				{
-					$buffer .= '="defer"';
+					continue;
 				}
-			}
 
-			if ($strAttr['async'])
-			{
-				$buffer .= ' async';
+				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
+				if ($attrib === 'mime')
+				{
+					$attrib = 'type';
+				}
+				// B/C defer and async can be set to yes when using the old method.
+				elseif (in_array($attrib, array('defer', 'async')) && $value === true)
+				{
+					$value = $attrib;
+				}
+
+				// Add attribute to script tag output.
+				$buffer .= ' ' . htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8');
 
-				if (!$document->isHtml5())
+				if (!($document->isHtml5() && in_array($attrib, $html5NoValueAttributes)))
 				{
-					$buffer .= '="async"';
+					// Json encode value if it's an array.
+					$value = !is_scalar($value) ? json_encode($value) : $value;
+
+					$buffer .= '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
 				}
 			}
 
-			$buffer .= '></script>' . $lnEnd;
+			$buffer .= '></script>';
+
+			// This is for IE conditional statements support.
+			if (!is_null($conditional))
+			{
+				$buffer .= '<![endif]-->';
+			}
+
+			$buffer .= $lnEnd;
 		}
 
 		// Generate script declarations
diff --git a/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php b/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
index 987ab83c19c6a..7d272b5eaac6a 100644
--- a/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
+++ b/tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php
@@ -492,7 +492,6 @@ public function testKeepalive()
 			array(
 				'JHtmlBehavior::keepalive' => true,
 				'JHtmlBehavior::core'      => true,
-				'JHtmlBehavior::framework' => array('core' => true),
 				'JHtmlBehavior::polyfill'  => array(md5(serialize(array('event', 'lt IE 9'))) => true),
 			),
 			JHtmlBehaviorInspector::getLoaded(),