diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index d58bc31..03afe9b 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -190,11 +190,17 @@ function node_type_form($form, &$form_state, $type = NULL) {
     '#collapsed' => TRUE,
     '#group' => 'additional_settings',
   );
-  $form['display']['node_submitted'] = array(
+  $form['display']['node_submitted_author'] = array(
     '#type' => 'checkbox',
-    '#title' => t('Display author and date information.'),
-    '#default_value' => variable_get('node_submitted_' . $type->type, TRUE),
-    '#description' => t('Author username and publish date will be displayed.'),
+    '#title' => t('Display author.'),
+    '#default_value' => variable_get('node_submitted_author_' . $type->type, TRUE),
+    '#description' => t('Author username will be displayed.'),
+  );
+  $form['display']['node_submitted_date'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Display submitted date.'),
+    '#default_value' => variable_get('node_submitted_date_' . $type->type, TRUE),
+    '#description' => t('Publish date will be displayed.'),
   );
   $form['old_type'] = array(
     '#type' => 'value',
diff --git a/modules/node/content_types.js b/modules/node/content_types.js
index 0031c32..e1242c1 100644
--- a/modules/node/content_types.js
+++ b/modules/node/content_types.js
@@ -23,8 +23,11 @@ Drupal.behaviors.contentTypes = {
       $('input:checked', context).next('label').each(function() {
         vals.push(Drupal.checkPlain($(this).text()));
       });
-      if (!$('#edit-node-submitted', context).is(':checked')) {
-        vals.unshift(Drupal.t("Don't display post information"));
+      if (!$('#edit-node-submitted-author', context).is(':checked')) {
+        vals.unshift(Drupal.t("Don't display author."));
+      }
+      if (!$('#edit-node-submitted-date', context).is(':checked')) {
+        vals.unshift(Drupal.t("Don't display submitted date."));
       }
       return vals.join(', ');
     });
diff --git a/modules/node/node.install b/modules/node/node.install
index 3f732a4..70c842d 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -443,6 +443,17 @@ function node_install() {
     ->execute();
 }
 
+function node_update_8000() {
+  $ret[] = array();
+  $node_types = db_query('SELECT * FROM {node_type}')->fetchAllAssoc('type', PDO::FETCH_OBJ);
+  foreach ($node_types as $type) {
+    $submitted = db_result(db_query("SELECT * FROM variable WHERE name='%s'", 'submitted_options_' . $type));
+    variable_set('node_submitted_author_' . $type, $submitted);
+    variable_set('node_submitted_date_' . $type, $submitted);
+    variable_del('node_options_' . $type);
+  }
+}
+
 /**
  * Utility function: fetch the node types directly from the database.
  *
@@ -469,3 +480,4 @@ function _update_7000_node_get_types() {
   }
   return $node_types;
 }
+
diff --git a/modules/node/node.module b/modules/node/node.module
index 1ecc093..6c47023 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1464,16 +1464,27 @@ function template_preprocess_node(&$variables) {
   // Make the field variables available with the appropriate language.
   field_attach_preprocess('node', $node, $variables['content'], $variables);
 
-  // Display post information only on certain node types.
-  if (variable_get('node_submitted_' . $node->type, TRUE)) {
-    $variables['display_submitted'] = TRUE;
-    $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['name'], '!datetime' => $variables['date']));
-    $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', array('account' => $node)) : '';
-  }
-  else {
+  // Make the submitted variable based on content type settings.
+  if (!variable_get('node_submitted_date_' . $node->type) && !variable_get('node_submitted_author_' . $node->type)) {
+    // Don't display any submitted information.
     $variables['display_submitted'] = FALSE;
     $variables['submitted'] = '';
     $variables['user_picture'] = '';
+  } elseif (variable_get('node_submitted_date_' . $node->type) && !variable_get('node_submitted_author_' . $node->type)) {
+    // Only display submitted date.
+    $variables['display_submitted'] = TRUE;
+    $variables['submitted'] = t('Submitted on !datetime', array('!datetime' => $variables['date']));
+    $variables['user_picture'] = '';
+  } elseif (!variable_get('node_submitted_date_' . $node->type) && variable_get('node_submitted_author_' . $node->type)) {
+    // Only display author.
+    $variables['display_submitted'] = TRUE;
+    $variables['submitted'] = t('Submitted by !author', array('!author' => $variables['name']));
+    $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', array('account' => $node)) : '';
+  } else {
+    // Display both author and date submmited.
+    $variables['display_submitted'] = TRUE;
+    $variables['submitted'] = t('Submitted by !author on !datetime', array('!author' => $variables['name'], '!datetime' => $variables['date']));
+    $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', array('account' => $node)) : '';
   }
 
   // Gather node classes.
diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install
index 5d44717..122301f 100644
--- a/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -256,7 +256,8 @@ function standard_install() {
   variable_set('comment_page', COMMENT_NODE_HIDDEN);
 
   // Don't display date and author information for "Basic page" nodes by default.
-  variable_set('node_submitted_page', FALSE);
+  variable_set('node_submitted_date_page', FALSE);
+  variable_set('node_submitted_author_page', FALSE);
 
   // Enable user picture support and set the default to a square thumbnail option.
   variable_set('user_pictures', '1');