Index: bbp-core-hooks.php
===================================================================
--- bbp-core-hooks.php	(revision 3172)
+++ bbp-core-hooks.php	(working copy)
@@ -35,7 +35,7 @@
 add_action( 'init',                   'bbp_init',                   10 );
 add_action( 'generate_rewrite_rules', 'bbp_generate_rewrite_rules', 12 );
 add_action( 'after_setup_theme',      'bbp_setup_theme_compat',     12 );
-add_action( 'template_include',       'bbp_template_include',       10 );
+add_filter( 'template_include',       'bbp_template_include',       10 );
 
 /**
  * bbp_loaded - Attached to 'plugins_loaded' above
