diff --git a/syntax/python.vim b/syntax/python.vim
index ffd88f9..6a4ca79 100644
--- a/syntax/python.vim
+++ b/syntax/python.vim
@@ -53,6 +53,7 @@ if s:Enabled('g:python_highlight_all')
   call s:EnableByDefault('g:python_highlight_space_errors')
   call s:EnableByDefault('g:python_highlight_doctests')
   call s:EnableByDefault('g:python_print_as_function')
+  call s:EnableByDefault('g:python_highlight_class_names')
   call s:EnableByDefault('g:python_highlight_class_vars')
   call s:EnableByDefault('g:python_highlight_operators')
 endif
@@ -63,7 +64,11 @@ endif
 
 syn keyword pythonStatement     break continue del return pass yield global assert lambda with
 syn keyword pythonStatement     raise nextgroup=pythonExClass skipwhite
-syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
+syn keyword pythonStatement     def nextgroup=pythonFunction skipwhite
+if s:Enabled('g:python_highlight_class_names')
+    syn keyword pythonStatement     class nextgroup=pythonClassName skipwhite
+    syn match   pythonClassName    '\%([[:upper:]][^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*' display contained
+endif
 if s:Enabled('g:python_highlight_class_vars')
   syn keyword pythonClassVar    self cls
 endif
@@ -407,6 +412,7 @@ if v:version >= 508 || !exists('did_python_syn_inits')
   HiLink pythonRaiseFromStatement   Statement
   HiLink pythonImport           Include
   HiLink pythonFunction         Function
+  HiLink pythonClassName        Structure
   HiLink pythonConditional      Conditional
   HiLink pythonRepeat           Repeat
   HiLink pythonException        Exception
diff --git a/tests/test.py b/tests/test.py
index 058f3f7..ac08e25 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -19,8 +19,11 @@
 
 def functionname
 class Classname
+class classname
 def функция
 class Класс
+class класс
+
 
 # Keywords: Python 2