diff --git a/runtime/syntax/indent.vim b/runtime/syntax/indent.vim
index 359a724..4934d01 100644
--- a/runtime/syntax/indent.vim
+++ b/runtime/syntax/indent.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:         indent(1) configuration file
 " Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2007-05-07
+" Latest Revision:  2007-05-10
 "   indent_is_bsd:  If exists, will change somewhat to match BSD implementation
 "
 " TODO: is the deny-all (a la lilo.vim nice or no?)...
@@ -26,17 +26,17 @@
 syn region  indentComment start='//' skip='\\$' end='$'
                           \ contains=indentTodo,@Spell
 
-syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
-                        \ nextgroup=indentNumber skipwhite skipnl
 if !exists("indent_is_bsd")
   syn match indentOptions '-i\|--indentation-level'
-                        \ nextgroup=indentNumber skipwhite skipnl
+                        \ nextgroup=indentNumber skipwhite skipempty
 endif
+syn match   indentOptions '-\%(bli\|c\%([bl]i\|[dip]\)\=\|di\=\|ip\=\|lc\=\|pp\=i\|sbi\|ts\|-\%(brace-indent\|comment-indentation\|case-brace-indentation\|declaration-comment-column\|continuation-indentation\|case-indentation\|else-endif-column\|line-comments-indentation\|declaration-indentation\|indent-level\|parameter-indentation\|line-length\|comment-line-length\|paren-indentation\|preprocessor-indentation\|struct-brace-indentation\|tab-size\)\)'
+                        \ nextgroup=indentNumber skipwhite skipempty
 
 syn match   indentNumber  display contained '\d\+\>'
 
 syn match   indentOptions '-T'
-                        \ nextgroup=indentIdent skipwhite skipnl
+                        \ nextgroup=indentIdent skipwhite skipempty
 
 syn match   indentIdent   display contained '\h\w*\>'
 
@@ -125,7 +125,7 @@
                         \ -version --version
 
 if exists("indent_is_bsd")
-  syn keyword indentOptions -ip -nip -dj -ndj -ei -nei
+  syn keyword indentOptions -ip -ei -nei
 endif
 
 if exists("c_minlines")