diff --git a/README.txt b/README.txt
index 2551c5e..a071557 100644
--- a/README.txt
+++ b/README.txt
@@ -222,22 +222,27 @@ hook_apachesolr_cck_fields_alter(&$mappings)
   text fields with option widgets:
 
     $mappings['text'] = array(
-      'optionwidgets_select' => array('indexing_callback' => '', 'index_type' => 'string'),
-      'optionwidgets_buttons' => array('indexing_callback' => '', 'index_type' => 'string')
+      'optionwidgets_select' => array('indexing_callback' => '', 'index_type' => 'string', 'facets' => TRUE),
+      'optionwidgets_buttons' => array('indexing_callback' => '', 'index_type' => 'string', 'facets' => TRUE)
     );
 
   In your _alter hook implementation you can add additional field types such as:
 
-    $mappings['number_integer']['number'] = array('indexing_callback' => '', 'index_type' => 'integer');
+    $mappings['number_integer']['number'] = array('indexing_callback' => '', 'index_type' => 'integer', 'facets' => TRUE);
 
   You can allso add a mapping for a specific field.  This will take precedence over any
   mapping for a general field type. A field-specific mapping would look like:
 
-    $mappings['per-field']['field_model_name'] = array('indexing_callback' => '', 'index_type' => 'string');
+    $mappings['per-field']['field_model_name'] = array('indexing_callback' => '', 'index_type' => 'string', 'facets' => TRUE);
 
   or
 
-    $mappings['per-field']['field_model_price'] = array('indexing_callback' => '', 'index_type' => 'float');
+    $mappings['per-field']['field_model_price'] = array('indexing_callback' => '', 'index_type' => 'float', 'facets' => TRUE);
+
+  If a custom field needs to be searchable but does not need to be faceted you can change the 'facets'
+  parameter to FALSE, like:
+
+    $mappings['number_integer']['number'] = array('callback' => '', 'index_type' => 'integer', 'facets' => FALSE);
 
 hook_apachesolr_types_exclude($namespace)
 
diff --git a/apachesolr_search.module b/apachesolr_search.module
index de277b7..af340d6 100644
--- a/apachesolr_search.module
+++ b/apachesolr_search.module
@@ -736,7 +736,7 @@ function apachesolr_search_apachesolr_facets() {
   $fields = apachesolr_cck_fields();
   if ($fields) {
     foreach ($fields as $name => $field) {
-      if ($field['facets']) {
+      if (!empty($field['facets'])) {
         // $delta can only be 32 chars, and the CCK field name may be this
         // long also, so we cannot add anything to it.
         $placeholders = array('@field_type' => $field['field_type'], '@field' => $field['widget']['label'], '@field_name' => $field['field_name']);
diff --git a/contrib/apachesolr_text/apachesolr_text.module b/contrib/apachesolr_text/apachesolr_text.module
index 29bc112..e6e79bd 100644
--- a/contrib/apachesolr_text/apachesolr_text.module
+++ b/contrib/apachesolr_text/apachesolr_text.module
@@ -8,6 +8,7 @@ function apachesolr_text_apachesolr_cck_fields_alter(&$mappings) {
     'display_callback' => 'apachesolr_cck_text_field_callback',
     'indexing_callback' => 'apachesolr_cck_text_indexing_callback',
     'index_type' => 'text',
+    'facets' => TRUE,
   );
   // Reroute the indexing callbacks for the optionwidget fields to this
   // module's version, apachesolr_text_cck_text_indexing_callback,