diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 36eed041619ced3cdfd3ee8d411db52e8035db1e..2ee52cf9ca1239fe12de76acd6654967d5682cbc 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed javascript_include_tag to output type instead of language and conform to XHTML #1018 [Rick Olson]
+
 * Added NumberHelper for common string representations like phone number, currency, and percentage #1015 [DeLynn]
 
 * Added pagination for scaffolding (10 items per page) #964 [mortonda@dgrmm.net]
diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index f6159e52465aac1adc05cc3dd222a101ae31a022..55036a3ff4281dbe5dbea7a91f2cd2c4b78f942b 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -26,15 +26,15 @@ def auto_discovery_link_tag(type = :rss, options = {})
       # Returns a script include tag per source given as argument. Examples:
       #
       #   javascript_include_tag "xmlhr" # =>
-      #     <script language="JavaScript" type="text/javascript" src="/javascripts/xmlhr.js"></script>
+      #     <script type="text/javascript" src="/javascripts/xmlhr.js"></script>
       #
       #   javascript_include_tag "common.javascript", "/elsewhere/cools" # =>
-      #     <script language="JavaScript" type="text/javascript" src="/javascripts/common.javascript"></script>
-      #     <script language="JavaScript" type="text/javascript" src="/elsewhere/cools.js"></script>
+      #     <script type="text/javascript" src="/javascripts/common.javascript"></script>
+      #     <script type="text/javascript" src="/elsewhere/cools.js"></script>
       def javascript_include_tag(*sources)
         sources.collect { |source|
           source = compute_public_path(source, 'javascripts', 'js')        
-          content_tag("script", "", "language" => "JavaScript", "type" => "text/javascript", "src" => source)
+          content_tag("script", "", "type" => "text/javascript", "src" => source)
         }.join("\n")
       end