diff -u vim-6.4/debian/updates/debcontrol.vim vim-6.4/debian/updates/debcontrol.vim
--- vim-6.4/debian/updates/debcontrol.vim
+++ vim-6.4/debian/updates/debcontrol.vim
@@ -28,7 +28,7 @@
 syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\|hppa\|i386\|ia64\|m68k\|mipsel\|mips\|powerpc\|s390\|sheb\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-i386\|knetbsd-i386\|netbsd-i386\)"
 syn match debcontrolName contained "\<\([0-9+-.]*[a-z][a-z0-9+-.]*\)\>"
 syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
-syn match debcontrolSection contained "\(\(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\)/\)\=\(admin\|base\|comm\|devel\|doc\|editors\|electronics\|embedded\|games\|gnome\|graphics\|hamradio\|interpreters\|kde\|libs\|libdevel\|mail\|math\|misc\|net\|news\|oldlibs\|otherosfs\|perl\|python\|science\|shells\|sound\|text\|tex\|utils\|web\|x11\|debian-installer\)"
+syn match debcontrolSection contained "\(\(universe\|multiverse\|non-US/main\|non-US/universe\|non-US/multiverse\)/\)\=\(admin\|base\|comm\|devel\|doc\|editors\|electronics\|embedded\|games\|gnome\|graphics\|hamradio\|interpreters\|kde\|libs\|libdevel\|mail\|math\|misc\|net\|news\|oldlibs\|otherosfs\|perl\|python\|science\|shells\|sound\|text\|tex\|utils\|web\|x11\|debian-installer\)"
 syn match debcontrolVariable contained "\${.\{-}}"
 
 " An email address
diff -u vim-6.4/debian/updates/debsources.vim vim-6.4/debian/updates/debsources.vim
--- vim-6.4/debian/updates/debsources.vim
+++ vim-6.4/debian/updates/debsources.vim
@@ -23,14 +23,14 @@
 
 " A bunch of useful keywords
 syn keyword sourcesKeyword      deb deb-src
-syn keyword sourcesKeyword      main contrib non-free
+syn keyword sourcesKeyword      main universe multiverse
 
 " Match comments
 syn match sourcesComment        /#.*/
 
 " Match uri's
 syn match sourcesUri            +\(http://\|ftp://\|file:///\)[^' 	<>"]\++
-syn match sourcesDistrKeyword   +\([[:alnum:]_./]*\)\(woody\|sarge\|etch\|old-stable\|stable\|testing\|unstable\|sid\|experimental\|warty\|hoary\|breezy\)\([[:alnum:]_./]*\)+
+syn match sourcesDistrKeyword   +\([[:alnum:]_./]*\)\(experimental\|warty\|hoary\|breezy\|dapper\)\([[:alnum:]_./]*\)+
 
 " Associate our matches and regions with pretty colours
 if version >= 508 || !exists("did_debsources_syn_inits")
diff -u vim-6.4/debian/changelog vim-6.4/debian/changelog
--- vim-6.4/debian/changelog
+++ vim-6.4/debian/changelog
@@ -1,3 +1,9 @@
+vim (1:6.4-006+2ubuntu3) dapper; urgency=low
+
+  * Dapperize debsources and debcontrol.vim
+
+ -- Barry deFreese <bddebian@comcast.net>  Sun,  9 Apr 2006 10:59:48 -0400
+
 vim (1:6.4-006+2ubuntu2) dapper; urgency=low
 
   * Reenable vim-ruby since we can now build it in main.