diff --git a/includes/ckeditor.admin.inc b/includes/ckeditor.admin.inc
index 5da5034..745829a 100644
--- a/includes/ckeditor.admin.inc
+++ b/includes/ckeditor.admin.inc
@@ -37,19 +37,21 @@
  * Main administrative page
  */
 function ckeditor_admin_main() {
+  $installed_profile = variable_get('install_profile', 'default');
   module_load_include('inc', 'ckeditor', 'includes/ckeditor.lib');
   $editor_path = ckeditor_path(TRUE);
   $ckconfig_file = $editor_path .'/config.js';
   if (!_ckeditor_requirements_isinstalled()) {
     drupal_set_message(t(
-      'Checking for !filename or !file.',
+      'Checking for !filename or !file or !profile',
       array(
         '!filename' => '<code>' . $ckconfig_file . '</code>',
-        '!file' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>'
+        '!file' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>',
+        '!profile' => '<code>profiles/' . $installed_profile . '/libraries/ckeditor/ckeditor.js</code>'
       )
     ));
     drupal_set_message(t(
-      'The CKEditor component is not installed correctly. Please go to the !ckeditorlink in order to download the latest version. After that you must extract the files to the !ckeditorpath or !librarypath directory and make sure that the !ckeditorfile or !ckeditorlibrary file exists. Refer to the !readme file for more information.',
+      'The CKEditor component is not installed correctly. Please go to the !ckeditorlink in order to download the latest version. After that you must extract the files to the !ckeditorpath or !librarypath or !profilepath directory and make sure that the !ckeditorfile or !ckeditorlibrary file exists. Refer to the !readme file for more information.',
       array(
         '!ckeditorlink' => l(t('CKEditor homepage'), 'http://ckeditor.com/download'),
         '!readme' => l(t('README.txt'), drupal_get_path('module', 'ckeditor') . '/README.txt', array('absolute' => TRUE)),
@@ -57,7 +59,8 @@ function ckeditor_admin_main() {
         '!ckeditorsubdir' => '<code>' . $editor_path . '/editor</code>',
         '!ckeditorfile' => '<code>' . $editor_path . '/ckeditor.js</code>',
         '!ckeditorlibrary' => '<code>sites/all/libraries/ckeditor/ckeditor.js</code>',
-        '!librarypath' => '<code>sites/all/libraries/ckeditor</code>'
+        '!librarypath' => '<code>sites/all/libraries/ckeditor</code>',
+        '!profilepath' => '<code>profiles/' . $installed_profile . '/libraries/ckeditor</code>'
       )
     ), 'error');
     drupal_set_message(t(
@@ -2114,4 +2117,4 @@ function ckeditor_toolbar_buttons_all($addPlugins = TRUE) {
   }
 
   return $buttons;
-}
\ No newline at end of file
+}
diff --git a/includes/ckeditor.lib.inc b/includes/ckeditor.lib.inc
index c756aed..439ecd9 100644
--- a/includes/ckeditor.lib.inc
+++ b/includes/ckeditor.lib.inc
@@ -592,6 +592,8 @@ function ckeditor_is_enabled($excl_mode, $excl_regex, $element_id, $get_q) {
 function _ckeditor_script_path() {
   $jspath = FALSE;
   $module_path=drupal_get_path('module', 'ckeditor');
+  $installed_profile = variable_get('install_profile', 'default');
+  $profile_path=drupal_get_path('profile', $installed_profile);
 
   if (file_exists($module_path . '/ckeditor/ckeditor.js')) {
     $jspath='%m/ckeditor';
@@ -599,6 +601,9 @@ function _ckeditor_script_path() {
   elseif (file_exists($module_path . '/ckeditor/ckeditor/ckeditor.js')) {
     $jspath='%m/ckeditor/ckeditor';
   }
+  elseif (file_exists($profile_path . '/libraries/ckeditor/ckeditor.js')) {
+    $jspath='%b/' . $profile_path . '/libraries/ckeditor';
+  }
   elseif (file_exists('sites/all/libraries/ckeditor/ckeditor.js')) {
     $jspath='%b/sites/all/libraries/ckeditor';
   }