diff --git a/plugin/drupal.vim b/plugin/drupal.vim
index 47a0247..9ab164e 100644
--- a/plugin/drupal.vim
+++ b/plugin/drupal.vim
@@ -122,9 +122,15 @@ function! s:DrupalInit()
   let directory = fnamemodify(path, ':h')
   let info = {'DRUPAL_ROOT': s:DrupalRoot(directory),
 	\ 'INFO_FILE': s:InfoPath(directory)}
-  let info.CORE = s:CoreVersion(info.INFO_FILE)
-  let info.TYPE = s:IniType(info.INFO_FILE)
   let info.OPEN_COMMAND = s:OpenCommand()
+  let info.TYPE = s:IniType(info.INFO_FILE)
+  let info.CORE = s:CoreVersion(info.INFO_FILE)
+  if info.CORE == '' && info.DRUPAL_ROOT != ''
+    let INFO_FILE = info.DRUPAL_ROOT . '/modules/system/system.info'
+    if filereadable(INFO_FILE)
+      let info.CORE = s:CoreVersion(INFO_FILE)
+    endif
+  endif
 
   " @var b:Drupal_info
   let b:Drupal_info = info