Index: includes/path.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/path.inc,v
retrieving revision 1.19.2.4
diff -u -r1.19.2.4 path.inc
--- includes/path.inc	28 May 2010 15:12:04 -0000	1.19.2.4
+++ includes/path.inc	13 Aug 2010 14:51:26 -0000
@@ -222,7 +222,7 @@
   if (!isset($is_front_page)) {
     // As drupal_init_path updates $_GET['q'] with the 'site_frontpage' path,
     // we can check it against the 'site_frontpage' variable.
-    $is_front_page = ($_GET['q'] == drupal_get_normal_path(variable_get('site_frontpage', 'node')));
+    $is_front_page = ($_GET['q'] == variable_get('site_frontpage', 'node'));
   }
 
   return $is_front_page;
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.63.2.14
diff -u -r1.63.2.14 system.admin.inc
--- modules/system/system.admin.inc	1 Mar 2010 10:20:28 -0000	1.63.2.14
+++ modules/system/system.admin.inc	16 Aug 2010 16:31:47 -0000
@@ -1173,7 +1173,7 @@
   $form['site_frontpage'] = array(
     '#type' => 'textfield',
     '#title' => t('Default front page'),
-    '#default_value' => variable_get('site_frontpage', 'node'),
+    '#default_value' => drupal_get_path_alias(variable_get('site_frontpage', 'node')),
     '#size' => 40,
     '#description' => t('The home page displays content from this relative URL. If unsure, specify "node".'),
     '#field_prefix' => url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
@@ -1192,6 +1192,8 @@
   if ($error = user_validate_mail($form_state['values']['site_mail'])) {
     form_set_error('site_mail', $error);
   }
+  // Get the normal path of the font page.
+  form_set_value($form['site_frontpage'], drupal_get_normal_path($form_state['values']['site_frontpage']), $form_state);
   // Validate front page path.
   $item = array('link_path' => $form_state['values']['site_frontpage']);
   $normal_path = drupal_get_normal_path($item['link_path']);
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.238.2.24
diff -u -r1.238.2.24 system.install
--- modules/system/system.install	6 Aug 2010 10:54:12 -0000	1.238.2.24
+++ modules/system/system.install	13 Aug 2010 15:05:00 -0000
@@ -2710,6 +2710,13 @@
 }
 
 /**
+ * Normalize the front page path variable.
+ */
+function system_update_6056() {
+  variable_set('site_frontpage', drupal_get_normal_path(variable_get('site_frontpage', 'node')));
+}
+
+/**
  * @} End of "defgroup updates-6.x-extra"
  * The next series of updates should start at 7000.
  */