diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index b1eb2ec..8ca6f6a 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1496,7 +1496,7 @@
 au BufNewFile,BufRead *.sa			setf sather
 
 " Scala
-au BufNewFile,BufRead *.scala			setf scala
+au BufNewFile,BufRead *.scala,*.sc		setf scala
 
 " SBT - Scala Build Tool
 au BufNewFile,BufRead *.sbt			setf sbt
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 1b07b0e..ac227fe 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -423,7 +423,7 @@
     \ 'sass': ['file.sass'],
     \ 'sather': ['file.sa'],
     \ 'sbt': ['file.sbt'],
-    \ 'scala': ['file.scala'],
+    \ 'scala': ['file.scala', 'file.sc'],
     \ 'scheme': ['file.scm', 'file.ss', 'file.rkt'],
     \ 'scilab': ['file.sci', 'file.sce'],
     \ 'screen': ['.screenrc', 'screenrc'],
diff --git a/src/version.c b/src/version.c
index 1e9a787..f9529ab 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2954,
+/**/
     2953,
 /**/
     2952,