--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@ -137,7 +137,7 @@ if s:line1 =~# "^#!"
     set ft=ruby
 
     " JavaScript
-  elseif s:name =~# 'node\(js\)\=\>' || s:name =~# 'rhino\>'
+  elseif s:name =~# 'node\(js\)\=\>\|js\>' || s:name =~# 'rhino\>'
     set ft=javascript
 
     " BC calculator

--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -561,10 +561,13 @@ let s:script_checks = {
       \ 'perl6': [['#!/path/perl6']],
       \ 'perl': [['#!/path/perl']],
       \ 'php': [['#!/path/php']],
-      \ 'python': [['#!/path/python']],
+      \ 'python': [['#!/path/python'],
+      \            ['#!/path/python2'],
+      \            ['#!/path/python3']],
       \ 'groovy': [['#!/path/groovy']],
       \ 'ruby': [['#!/path/ruby']],
       \ 'javascript': [['#!/path/node'],
+      \                ['#!/path/js'],
       \                ['#!/path/nodejs'],
       \                ['#!/path/rhino']],
       \ 'bc': [['#!/path/bc']],

--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1465,
+/**/
     1464,
 /**/
     1463,