Index: libs/ardour/template_utils.cc
===================================================================
--- libs/ardour/template_utils.cc	(revision 11269)
+++ libs/ardour/template_utils.cc	(working copy)
@@ -66,8 +66,17 @@
 }
 
 static bool
-template_filter (const string &str, void */*arg*/)
+route_template_filter (const string &str, void */*arg*/)
 {
+	cerr << "Checking into " << str << " using " << template_suffix << endl;
+        return (str.length() > strlen(template_suffix) && 	              
+	        str.find (template_suffix) == (str.length() - strlen (template_suffix))); 
+}
+
+static bool
+session_template_filter (const string &str, void */*arg*/)
+{
+
 	if (!Glib::file_test (str, Glib::FILE_TEST_IS_DIR)) {
 		return false;
 	}
@@ -93,7 +102,7 @@
 	SearchPath spath (system_template_directory());
 	spath += user_template_directory ();
 
-	templates = scanner (spath.to_string(), template_filter, 0, true, true);
+	templates = scanner (spath.to_string(), session_template_filter, 0, true, true);
 
 	if (!templates) {
 		cerr << "Found nothing along " << spath.to_string() << endl;
@@ -130,7 +139,7 @@
 	SearchPath spath (system_route_template_directory());
 	spath += user_route_template_directory ();
 
-	templates = scanner (spath.to_string(), template_filter, 0, false, true);
+	templates = scanner (spath.to_string(), route_template_filter, 0, false, true);
 
 	if (!templates) {
 		return;