diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 9846cfd..76b52cf 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2023 Oct 11
+" Last Change: 2024 Jan 30
 " URL: https://salsa.debian.org/vim-team/vim-debian/blob/main/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -14,9 +14,9 @@
 syn case match
 
 " A bunch of useful keywords
-syn match debsourcesType               /\(deb-src\|deb\)/
-syn match debsourcesFreeComponent      /\(main\|universe\)/
-syn match debsourcesNonFreeComponent   /\(contrib\|non-free-firmware\|non-free\|restricted\|multiverse\)/
+syn match debsourcesType               /\<\(deb-src\|deb\)\>/ contained
+syn match debsourcesFreeComponent      /\<\(main\|universe\)\>/ contained
+syn match debsourcesNonFreeComponent   /\<\(contrib\|non-free-firmware\|non-free\|restricted\|multiverse\)\>/ contained
 
 " Match comments
 syn match debsourcesComment        /#.*/  contains=@Spell
@@ -34,7 +34,6 @@
 syn match debsourcesUri            '\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\+'
 syn region debsourcesLine start="^" end="$" contains=debsourcesType,debsourcesFreeComponent,debsourcesNonFreeComponent,debsourcesComment,debsourcesUri,debsourcesDistrKeyword,debsourcesUnsupportedDistrKeyword oneline
 
-
 " Associate our matches and regions with pretty colours
 hi def link debsourcesType                    Statement
 hi def link debsourcesFreeComponent           Statement