Index: src/includes/core/template-loader.php
===================================================================
--- src/includes/core/template-loader.php	(revision 5935)
+++ src/includes/core/template-loader.php	(working copy)
@@ -509,6 +509,7 @@
  * Get the templates to use as the endpoint for bbPress template parts
  *
  * @since bbPress (r3311)
+ * @since 2.6.0 Added singular.php to stack
  *
  * @uses apply_filters()
  * @uses bbp_set_theme_compat_templates()
@@ -524,6 +525,7 @@
 		'generic.php',
 		'page.php',
 		'single.php',
+		'singular.php',
 		'index.php'
 	);
 	return bbp_get_query_template( 'bbpress', $templates );