diff -Nru vim-bitbake-0~git20200915/debian/changelog vim-bitbake-0~git20210803/debian/changelog
--- vim-bitbake-0~git20200915/debian/changelog	2020-11-28 22:38:25.000000000 +0000
+++ vim-bitbake-0~git20210803/debian/changelog	2021-10-08 06:50:24.000000000 +0000
@@ -1,3 +1,11 @@
+vim-bitbake (0~git20210803-1) unstable; urgency=medium
+
+  * New upstream release considering valid new override syntax.
+  * Std-version is now 4.6.0
+  * Add R^3: no
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 08 Oct 2021 08:50:24 +0200
+
 vim-bitbake (0~git20200915-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru vim-bitbake-0~git20200915/debian/control vim-bitbake-0~git20210803/debian/control
--- vim-bitbake-0~git20200915/debian/control	2020-11-28 22:38:25.000000000 +0000
+++ vim-bitbake-0~git20210803/debian/control	2021-10-08 06:50:24.000000000 +0000
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Gianfranco Costamagna <locutusofborg@debian.org>
 Build-Depends: debhelper-compat (=13)
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
+Rules-Requires-Root: no
 Homepage: https://github.com/kergoth/vim-bitbake/
 
 Package: vim-bitbake
diff -Nru vim-bitbake-0~git20200915/syntax/bitbake.vim vim-bitbake-0~git20210803/syntax/bitbake.vim
--- vim-bitbake-0~git20200915/syntax/bitbake.vim	2020-09-15 03:08:45.000000000 +0000
+++ vim-bitbake-0~git20210803/syntax/bitbake.vim	2021-08-03 20:36:13.000000000 +0000
@@ -38,7 +38,7 @@
 syn match bbComment             "#.*$" contains=@bbCommentGroup
 
 " String helpers
-syn match bbQuote               +['"]+ contained 
+syn match bbQuote               +['"]+ contained
 syn match bbDelimiter           "[(){}=]" contained
 syn match bbArrayBrackets       "[\[\]]" contained
 
@@ -53,7 +53,7 @@
 syn match bbIdentifier          "[a-zA-Z0-9\-_\.\/\+]\+" display contained
 syn match bbVarDeref            "${[a-zA-Z0-9\-_\.\/\+]\+}" contained
 syn match bbVarEq               "\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)" contained nextgroup=bbVarValue
-syn match bbVarDef              "^\(export\s*\)\?\([a-zA-Z0-9\-_\.\/\+]\+\(_[${}a-zA-Z0-9\-_\.\/\+]\+\)\?\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbVarDeref nextgroup=bbVarEq
+syn match bbVarDef              "^\(export\s*\)\?\([a-zA-Z0-9\-_:\.\/\+]\+\([_:][${}a-zA-Z0-9\-_:\.\/\+]\+\)\?\)\s*\(:=\|+=\|=+\|\.=\|=\.\|?=\|??=\|=\)\@=" contains=bbExportFlag,bbIdentifier,bbVarDeref nextgroup=bbVarEq
 syn match bbVarValue            ".*$" contained contains=bbString,bbVarDeref,bbVarPyValue
 syn region bbVarPyValue         start=+${@+ skip=+\\$+ end=+}+ contained contains=@python
 
@@ -62,7 +62,7 @@
 syn region bbVarFlagFlag        matchgroup=bbArrayBrackets start="\[" end="\]\s*\(:=\|=\|.=\|=.|+=\|=+\|?=\)\@=" contained contains=bbIdentifier nextgroup=bbVarEq
 
 " Includes and requires
-syn keyword bbInclude           inherit include require contained 
+syn keyword bbInclude           inherit include require contained
 syn match bbIncludeRest         ".*$" contained contains=bbString,bbVarDeref
 syn match bbIncludeLine         "^\(inherit\|include\|require\)\s\+" contains=bbInclude nextgroup=bbIncludeRest
 
@@ -83,7 +83,7 @@
   unlet b:current_syntax
 endif
 syn keyword bbShFakeRootFlag    fakeroot contained
-syn match bbShFuncDef           "^\(fakeroot\s*\)\?\([\.0-9A-Za-z_${}\-\.]\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbShFuncRegion skipwhite
+syn match bbShFuncDef           "^\(fakeroot\s*\)\?\([\.0-9A-Za-z_${}\-\:\.]\+\)\(python\)\@<!\(\s*()\s*\)\({\)\@=" contains=bbShFakeRootFlag,bbFunction,bbVarDeref,bbDelimiter nextgroup=bbShFuncRegion skipwhite
 syn region bbShFuncRegion       matchgroup=bbDelimiter start="{\s*$" end="^}\s*$" contained contains=@shell
 
 " Python value inside shell functions