Index: template.php
===================================================================
--- template.php	(revision 29521)
+++ template.php	(working copy)
@@ -89,6 +89,7 @@
 
 	if ( count( $post_types ) == 1 ) {
 		$post_type = reset( $post_types );
+		$templates[] = "{$post_type}/archive.php";
 		$templates[] = "archive-{$post_type}.php";
 	}
 	$templates[] = 'archive.php';
@@ -376,6 +377,7 @@
 	$templates = array();
 
 	if ( ! empty( $object->post_type ) )
+		$templates[] = "{$object->post_type}/single.php";
 		$templates[] = "single-{$object->post_type}.php";
 	$templates[] = "single.php";