--- a/ckeditor.install	2011-11-30 23:04:57.000000000 -0800
+++ b/ckeditor.install	2011-12-08 15:10:47.000000000 -0800
@@ -376,19 +376,18 @@ function _ckeditor_requirements_getinsta
  * @return string|boolean
  */
 function _ckeditor_requirements_ckfinder_config_check($profile_name) {
-  module_load_include('module', 'ckeditor');
-  $lib_path = drupal_get_path('module', 'ckeditor');
-  $config_path = $lib_path .'/ckfinder/config.php';
+  $ckfinder_full_path = ckfinder_path();
+  $config_path = realpath('.'.base_path()) . $ckfinder_full_path .'/config.php';
 
   if (!file_exists($config_path)) {
     return t('!ckfinder is not installed correctly: <code>!config</code> not found. Make sure that you uploaded all files and did not accidentally remove the configuration file.', array(
-      '!config' => $lib_path .'/ckfinder/config.php',
+      '!config' => $config_path,
       '!ckfinder' => '<a href="http://ckfinder.com">CKFinder</a>'
     ));
   }
 
   if (!is_readable($config_path)) {
-    return t('CKEditor needs read permission to the <code>!config</code> file.', array('!config' => 'ckfinder/config.php'));
+    return t('CKEditor needs read permission to the <code>!config</code> file.', array('!config' => $config_path));
   }
 
   $config_contents = file($config_path);
@@ -418,12 +417,12 @@ function _ckeditor_requirements_ckfinder
   }
 
   if (!$require_once_found) {
-    return t('You are using a feature that requires manual integration in the <code>config.php</code> file. Please read the "Installing CKFinder" section in the <code>!readme</code> file carefully and add a <code>require_once ...</code> statement to the <code>%ckfconfig</code> file.', array('%ckfconfig' => drupal_get_path('module', 'ckeditor') . '/ckfinder/config.php', '!readme' => l(t('README.txt'), $base_url . '/' . drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE))));
+    return t('You are using a feature that requires manual integration in the <code>config.php</code> file. Please read the "Installing CKFinder" section in the <code>!readme</code> file carefully and add a <code>require_once ...</code> statement to the <code>%ckfconfig</code> file.', array('%ckfconfig' => $config_path, '!readme' => l(t('README.txt'), $base_url . '/' . drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE))));
   }
 
   if ($userfiles_absolute_path_line && $force_single_extension_line && (
   $require_once_line < $userfiles_absolute_path_line || $require_once_line > $force_single_extension_line)) {
-    return t('You are using a feature that requires manual integration in the <code>config.php</code> file. You have added a <code>require_once ...</code> statement to the <code>%ckfconfig</code> file, but in the wrong line.', array('%ckfconfig' => drupal_get_path('module', 'ckeditor') . '/ckfinder/config.php'));
+    return t('You are using a feature that requires manual integration in the <code>config.php</code> file. You have added a <code>require_once ...</code> statement to the <code>%ckfconfig</code> file, but in the wrong line.', array('%ckfconfig' => $config_path));
   }
 
   return FALSE;
@@ -628,4 +627,4 @@ function ckeditor_update_6102() {
  */
 function ckeditor_uninstall() {
   drupal_uninstall_schema('ckeditor');
-}
\ No newline at end of file
+}