Index: wp-includes/theme.php
===================================================================
--- wp-includes/theme.php	(revision 12915)
+++ wp-includes/theme.php	(working copy)
@@ -897,13 +897,28 @@
 
 /**
  * Retrieve path of single template in current or parent template.
+ * 
+ * Will first look for singular-{post_type}-{slug}.php
+ * The will search for 'singular-{post_type}-{id}.php' followed by 'singular-{post_type}.php',
+ * and finally 'singular.php'
  *
  * @since 1.5.0
  *
  * @return string
  */
 function get_single_template() {
-	return get_query_template('single');
+	global $wp_query;
+	
+	$id = (int) $wp_query->post->ID;
+	
+	$templates = array();
+	$templates[] = "singular-{$wp_query->post->post_type}-{$wp_query->post->post_name}.php";
+	$templates[] = "singular-{$wp_query->post->post_type}-{$id}.php";
+	$templates[] = "singular-{$wp_query->post->post_type}.php";
+	$templates[] = "singular.php";
+	$templates[] = "single.php"; // Deprecated, use singular.php instead
+	
+	return apply_filters('single_template', locate_template($templates));
 }
 
 /**