diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index c9cf542..051c95c 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2016 Aug 14
+" Last Change:	2016 Sep 14
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -88,14 +88,14 @@
 " followed by decorator name, optional parenthesized list of arguments,
 " and the next line with either def, class, or another decorator.
 syn match   pythonDecorator
-  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\)\zs@\%(\s*\h\%(\w\|\.\)*\%(([^)]*)\)\=\s*\n\s*\%(\.\.\.\s\+\)\=\%(@\s*\h\|\%(def\|class\)\s\+\)\)\@="
+  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\)\zs@\%(\s*\h\%(\w\|\.\)*\s*\%((\_\s\{-}[^)]\_.\{-})\s*\)\=\%(#.*\)\=\n\s*\%(\.\.\.\s\+\)\=\%(@\s*\h\|\%(def\|class\)\s\+\)\)\@="
   \ display nextgroup=pythonDecoratorName skipwhite
 
 " A dot must be allowed because of @MyClass.myfunc decorators.
 " It must be preceded by a decorator symbol and on a separate line from
 " a function/class it decorates.
 syn match   pythonDecoratorName
-  \ "\%(@\s*\)\@<=\h\%(\w\|\.\)*\%(\%(([^)]*)\)\=\s*\n\)\@="
+  \ "\%(@\s*\)\@<=\h\%(\w\|\.\)*\%(\s*\%((\_\s\{-}[^)]\_.\{-})\s*\)\=\%(#.*\)\=\n\)\@="
   \ contained display nextgroup=pythonFunction skipnl
 
 " The zero-length non-grouping match of def or class before the function
@@ -289,43 +289,41 @@
 " Sync at the beginning of class, function, or method definition.
 syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
 
-
 " The default highlight links.  Can be overridden later.
-hi def link pythonStatement	Statement
-hi def link pythonConditional	Conditional
+hi def link pythonStatement		Statement
+hi def link pythonConditional		Conditional
 hi def link pythonRepeat		Repeat
 hi def link pythonOperator		Operator
-hi def link pythonException	Exception
+hi def link pythonException		Exception
 hi def link pythonInclude		Include
-hi def link pythonAsync		Statement
-hi def link pythonDecorator	Define
-hi def link pythonDecoratorName	Function
+hi def link pythonAsync			Statement
+hi def link pythonDecorator		Define
+hi def link pythonDecoratorName		Function
 hi def link pythonFunction		Function
 hi def link pythonComment		Comment
-hi def link pythonTodo		Todo
+hi def link pythonTodo			Todo
 hi def link pythonString		String
-hi def link pythonRawString	String
+hi def link pythonRawString		String
 hi def link pythonQuotes		String
-hi def link pythonTripleQuotes	pythonQuotes
+hi def link pythonTripleQuotes		pythonQuotes
 hi def link pythonEscape		Special
 if !exists("python_no_number_highlight")
   hi def link pythonNumber		Number
 endif
 if !exists("python_no_builtin_highlight")
-  hi def link pythonBuiltin	Function
+  hi def link pythonBuiltin		Function
 endif
 if !exists("python_no_exception_highlight")
-  hi def link pythonExceptions	Structure
+  hi def link pythonExceptions		Structure
 endif
 if exists("python_space_error_highlight")
-  hi def link pythonSpaceError	Error
+  hi def link pythonSpaceError		Error
 endif
 if !exists("python_no_doctest_highlight")
-  hi def link pythonDoctest	Special
+  hi def link pythonDoctest		Special
   hi def link pythonDoctestValue	Define
 endif
 
-
 let b:current_syntax = "python"
 
 let &cpo = s:cpo_save