Index: .
===================================================================
--- .	(revision 23583)
+++ .	(working copy)
@@ -208,18 +208,23 @@
 
 /**
  * Retrieve path of front-page template in current or parent template.
+ * 
+ * If site is configured to display the posts page as the site front page, 
+ * retrieves the path of the home template; otherwise, looks for 'front-page.php'.
  *
- * Looks for 'front-page.php'.
- *
  * @since 3.0.0
  * @uses apply_filters() Calls 'front_page_template' on file path of template.
  *
  * @return string
  */
 function get_front_page_template() {
-	$templates = array('front-page.php');
+	if ( 'posts' == get_option( 'show_on_front' ) ) {
+		get_home_template();
+	} else {
+		$templates = array('front-page.php');
 
-	return get_query_template( 'front_page', $templates );
+		return get_query_template( 'front_page', $templates );
+	}
 }
 
 /**