diff -ruN ckeditor/ckeditor.module ckeditor-elfinder/ckeditor.module
--- ckeditor/ckeditor.module	2010-09-27 16:49:01.000000000 +0400
+++ ckeditor-elfinder/ckeditor.module	2010-11-12 04:01:18.000000000 +0300
@@ -674,6 +674,10 @@
       $filebrowser = 'none';
     }
 
+    if ($filebrowser == 'elfinder' && !module_exists('elfinder')) {
+      $filebrowser = 'none';
+    }
+    
     if ($filebrowser == 'tinybrowser' && !module_exists('tinybrowser')) {
       $filebrowser = 'none';
     }
@@ -689,6 +693,9 @@
       if ($filebrowser_image == 'imce' && !module_exists('imce')) {
         $filebrowser_image = $filebrowser;
       }
+      if ($filebrowser_image == 'elfinder' && !module_exists('elfinder')) {
+        $filebrowser_image = $filebrowser;
+      }      
       if ($filebrowser_image == 'tinybrowser' && !module_exists('tinybrowser')) {
         $filebrowser_image = $filebrowser;
       }
@@ -704,6 +711,9 @@
       if ($filebrowser_flash == 'imce' && !module_exists('imce')) {
         $filebrowser_flash = $filebrowser;
       }
+      if ($filebrowser_flash == 'elfinder' && !module_exists('elfinder')) {
+        $filebrowser_flash = $filebrowser;
+      }
       if ($filebrowser_image == 'tinybrowser' && !module_exists('tinybrowser')) {
         $filebrowser_flash = $filebrowser;
       }
@@ -762,6 +772,9 @@
       case 'imce':
         $settings[$textarea_id]['filebrowserBrowseUrl'] = $host ."index.php?q=imce&app=ckeditor|sendto@ckeditor_fileUrl|";
         break;
+      case 'elfinder':
+        $settings[$textarea_id]['filebrowserBrowseUrl'] = $host ."index.php?q=elfinder&app=ckeditor";
+        break;        
       case 'webfm':
         if (user_access('access webfm')) {
           $settings[$textarea_id]['filebrowserBrowseUrl'] = $host ."index.php?q=webfm_popup";
@@ -792,6 +805,9 @@
         case 'imce':
           $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $host ."index.php?q=imce&app=ckeditor|sendto@ckeditor_fileUrl|";
           break;
+        case 'elfinder':
+          $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $host ."index.php?q=elfinder&app=ckeditor";
+          break;
         case 'webfm':
           if (user_access('access webfm')) {
             $settings[$textarea_id]['filebrowserImageBrowseUrl'] = $host ."index.php?q=webfm_popup";
@@ -823,6 +839,9 @@
         case 'imce':
           $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $host ."index.php?q=imce&app=ckeditor|sendto@ckeditor_fileUrl|";
           break;
+        case 'elfinder':
+          $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $host ."index.php?q=elfinder&app=ckeditor";
+          break;
         case 'webfm':
           if (user_access('access webfm')) {
             $settings[$textarea_id]['filebrowserFlashBrowseUrl'] = $host ."index.php?q=webfm_popup";
diff -ruN ckeditor/includes/ckeditor.admin.inc ckeditor-elfinder/includes/ckeditor.admin.inc
--- ckeditor/includes/ckeditor.admin.inc	2010-09-15 19:23:36.000000000 +0400
+++ ckeditor-elfinder/includes/ckeditor.admin.inc	2010-11-12 04:08:19.000000000 +0300
@@ -696,7 +696,7 @@
     '#title' => t('File browser settings'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-    '#description' => t('Set file browser settings. A file browser will allow you to explore the files contained on the server and embed them as links, images or flash movies. CKEditor is compatible with contributed modules like <a href="!imce">IMCE</a>, <a href="!ib">Image Browser</a> or <a href="!webfm">Web File Manager</a>. CKEditor can be also integrated with <a href="!ckfinder">CKFinder</a>.', array('!imce' => url('http://drupal.org/project/imce'), '!ib' => url('http://drupal.org/project/imagebrowser'), '!webfm' => url('http://drupal.org/project/webfm'), '!readme' => url('admin/help/ckeditor'), '!ckfinder' => url('http://ckfinder.com')))
+    '#description' => t('Set file browser settings. A file browser will allow you to explore the files contained on the server and embed them as links, images or flash movies. CKEditor is compatible with contributed modules like <a href="!imce">IMCE</a>, <a href="!ib">Image Browser</a>, <a href="!webfm">Web File Manager</a> or <a href="!elfinder">elFinder</a>. CKEditor can be also integrated with <a href="!ckfinder">CKFinder</a>.', array('!imce' => url('http://drupal.org/project/imce'), '!ib' => url('http://drupal.org/project/imagebrowser'), '!webfm' => url('http://drupal.org/project/webfm'), '!readme' => url('admin/help/ckeditor'), '!ckfinder' => url('http://ckfinder.com'), '!elfinder' => url('http://drupal.org/project/elfinder')))
   );
 
   $filebrowsers = array(
@@ -729,6 +729,11 @@
     $filebrowsers_dialogs['webfm'] = t('Web File Manager');
   }
 
+  if (module_exists('elfinder')) {
+    $filebrowsers['elfinder'] = t('elFinder');
+    $filebrowsers_dialogs['elfinder'] = t('elFinder');
+  }
+  
   $form['ckeditor_upload_settings']['filebrowser'] = array(
     '#type' => 'select',
     '#title' => t('File browser type (Link dialog)'),