--- override_node_options.module	2009-07-01 14:41:00.000000000 +0200
+++ override_node_options-507300.module	2009-06-11 00:51:00.000000000 +0200
@@ -138,7 +138,7 @@ function override_node_options_form_alte
       _override_node_options_apply_keys($node);
     }
 
-    if(user_access('override ' . $form['type']['#value'] . ' published option') || user_access('override ' . $form['type']['#value'] . ' promote to front page option') || user_access('override ' . $form['type']['#value'] . ' sticky option') || user_access('override ' . $form['type']['#value'] . ' revision option')){
+    if(user_access('override ' . $form['type']['#value'] . ' published option') || user_access('override ' . $form['type']['#value'] . ' promote to front page option') || user_access('override ' . $form['type']['#value'] . ' sticky option')){
     
     $form['options'] = array(
           '#type' => 'fieldset',
@@ -167,10 +167,26 @@ function override_node_options_form_alte
     }
     
     if(user_access('override ' . $form['type']['#value'] . ' revision option')){
-          $form['options']['override_publishing_revision'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Create new revision'),
-          '#default_value' => $node->revision);
+    $form['revision_information'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Revision information'),
+      '#collapsible' => TRUE,
+      // Collapsed by default when "Create new revision" is unchecked
+      '#collapsed' => !$node->revision,
+      '#weight' => 20,
+    );
+				 $form['revision_information']['override_revision_revision'] = array(
+					 '#type' => 'checkbox',
+					 '#title' => t('Create new revision'),
+					 '#default_value' => $node->revision,
+				 );
+				 $form['revision_information']['override_revision_log'] = array(
+					 '#type' => 'textarea',
+					 '#title' => t('Log message'),
+					 '#default_value' => (isset($node->log) ? $node->log : ''),
+					 '#rows' => 2,
+					 '#description' => t('An explanation of the additions or updates being made to help other authors understand your motivations.'),
+				 );
     }
     if(user_access('override ' . $form['type']['#value'] . ' authored by option') || user_access('override ' . $form['type']['#value'] . ' authored on option')){
     $form['author'] = array(
@@ -234,7 +250,8 @@ function _override_node_options_apply_ke
           'override_publishing_status' => 'status',
           'override_publishing_promote' => 'promote',
           'override_publishing_sticky' => 'sticky',
-          'override_publishing_revision' => 'revision'
+          'override_revision_revision' => 'revision',
+          'override_revision_log' => 'log'
         );
 
         $options = variable_get('node_options_' . $node->type, NULL);