diff -ru --from fckeditor.orig fckeditor.orig/fckeditor.admin.inc fckeditor/fckeditor.admin.inc
--- fckeditor.orig/fckeditor.admin.inc	2009-11-02 13:59:36.000000000 -0500
+++ fckeditor/fckeditor.admin.inc	2009-11-16 11:38:56.000000000 -0500
@@ -750,6 +750,10 @@
     $filebrowsers['webfm'] = t('Web File Manager');
   }
 
+  if (file_exists(_fckeditor_ckfinder_path())) {
+    $filebrowsers['ckfinder'] = t('CKFinder');
+  }
+
   $form['fckeditor_upload_settings']['filebrowser'] = array(
     '#type' => 'select',
     '#title' => t('File browser type'),
diff -ru --from fckeditor.orig fckeditor.orig/fckeditor.module fckeditor/fckeditor.module
--- fckeditor.orig/fckeditor.module	2009-10-24 05:48:27.000000000 -0400
+++ fckeditor/fckeditor.module	2009-11-16 11:38:45.000000000 -0500
@@ -42,6 +42,10 @@
 $_fckeditor_configuration = array();
 $_fckeditor_js_ids = array();
 
+function _fckeditor_ckfinder_path() {
+  return drupal_get_path('module', 'fckeditor') . '/ckfinder/ckfinder.php';
+}
+
 /**
  * Implementation of hook_help().
  *
@@ -661,6 +665,9 @@
       if ($filebrowser == 'webfm' && !module_exists('webfm_popup')) {
         $filebrowser = 'none';
       }
+      if ($filebrowser == 'ckfinder' && !file_exists(_fckeditor_ckfinder_path())) {
+        $filebrowser = 'none';
+      }
       $quickupload = (!empty($conf['quickupload']) && $conf['quickupload'] == 't');
 
       // load variables used by both quick upload and filebrowser
@@ -751,6 +758,15 @@
           $js .= $js_id .".Config['LinkBrowserWindowHeight'] = '439';";
           break;
 
+        case 'ckfinder':
+          $js .= $js_id .".Config['LinkBrowser'] = true;\n";
+          $js .= $js_id .".Config['ImageBrowser'] = true;\n";
+          $js .= $js_id .".Config['FlashBrowser'] = true;\n";
+          $js .= $js_id .".Config['LinkBrowserURL'] = '". $module_full_path ."/ckfinder/ckfinder.html';\n";
+          $js .= $js_id .".Config['ImageBrowserURL'] = '". $module_full_path ."/ckfinder/ckfinder.html?type=Images';\n";
+          $js .= $js_id .".Config['FlashBrowserURL'] = '". $module_full_path ."/ckfinder/ckfinder.html?type=Flash';\n";
+          break;
+
         default:
         case 'none':
           $js .= $js_id .".Config['LinkBrowser'] = false;\n";