diff --git a/handlers/views_handler_field_date.inc b/handlers/views_handler_field_date.inc
index b122b66..d3084e9 100644
--- a/handlers/views_handler_field_date.inc
+++ b/handlers/views_handler_field_date.inc
@@ -37,13 +37,35 @@ class views_handler_field_date extends views_handler_field {
       ),
       '#default_value' => isset($this->options['date_format']) ? $this->options['date_format'] : 'small',
     );
+
+
+    $now = (isset($this->options['custom_date_format']) ? t('Displayed as %date', array('%date' => format_date(REQUEST_TIME, 'custom', $this->options['custom_date_format']))) : '');
+
     $form['custom_date_format'] = array(
       '#type' => 'textfield',
       '#title' => t('Custom date format'),
       '#description' => t('If "Custom", see <a href="http://us.php.net/manual/en/function.date.php" target="_blank">the PHP docs</a> for date formats. Otherwise, enter the number of different time units to display, which defaults to 2.'),
       '#default_value' => isset($this->options['custom_date_format']) ? $this->options['custom_date_format'] : '',
       '#dependency' => array('edit-options-date-format' => array('custom', 'raw time ago', 'time ago', 'raw time hence', 'time hence', 'raw time span', 'time span', 'raw time span', 'inverse time span', 'time span')),
+      '#field_suffix' => ' <small id="edit-options-custom-date-format-suffix">' . $now . '</small>',
+    );
+
+    // Add js to preview the rendering of the custom date format.
+    $js_settings = array(
+      'type' => 'setting',
+      'data' => array(
+        'DateTime' => array(
+          'options-custom-date-format' => array(
+            'text' => t('Displayed as'),
+            'lookup' => url('admin/config/regional/date-time/formats/lookup'),
+          ),
+        ),
+      ),
+    );
+    $form['custom_date_format']['#attached'] = array(
+      'js' => array(drupal_get_path('module', 'system') . '/system.js', $js_settings),
     );
+    dsm($form);
 
     parent::options_form($form, $form_state);
   }