diff --git a/contrib/vim/hgcommand.vim b/contrib/vim/hgcommand.vim
--- a/contrib/vim/hgcommand.vim
+++ b/contrib/vim/hgcommand.vim
@@ -322,7 +322,7 @@ function! s:HGGetStatusVars(revisionVar,
   let fileName=bufname(hgBufferCheck)
   let fileNameWithoutLink=s:HGResolveLink(fileName)
   let realFileName = fnamemodify(fileNameWithoutLink, ':t')
-  let oldCwd=s:HGChangeToCurrentFileDir(fileName)
+  let oldCwd=s:HGChangeToCurrentFileDir(realFileName)
   try
     let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " root  " 
     let roottext=system(hgCommand)
@@ -332,14 +332,14 @@ function! s:HGGetStatusVars(revisionVar,
       return ""
     endif
     let returnExpression = ""
-    let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " status -mardui " . fileName
+    if a:repositoryVar != ""
+      let returnExpression=returnExpression . " | let " . a:repositoryVar . "='" . roottext . "'"
+    endif
+    let hgCommand = s:HGGetOption("HGCommandHGExec", "hg") . " status -mardui " . realFileName
     let statustext=system(hgCommand)
     if(v:shell_error)
       return ""
     endif
-    if a:repositoryVar != ""
-      let returnExpression=returnExpression . " | let " . a:repositoryVar . "='" . roottext . "'"
-    endif
     if match(statustext, '^[?I]') >= 0 
       let revision="NEW"
     elseif match(statustext, '^[R]') >= 0 
@@ -1677,6 +1677,11 @@ 8. Known bugs						      *hgcommand-bugs
    may still be bugs in here, depending on many configuration details.
 
 ==============================================================================
+
+9. TODO  						      *hgcommand-todo*
+
+   Integrate symlink tracking once HG will support them.
+==============================================================================
 === END_DOC
 """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " v im:tw=78:ts=8:ft=help:norl: