Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.425
diff -u -p -r1.425 theme.inc
--- includes/theme.inc	5 Jun 2008 18:21:06 -0000	1.425
+++ includes/theme.inc	14 Jun 2008 17:32:26 -0000
@@ -1965,7 +1965,8 @@ function template_preprocess_node(&$vari
     $variables['picture'] = '';
   }
   // Clean up name so there are no underscores.
-  $variables['template_files'][] = 'node-' . $node->type;
+  $variables['template_files'][] = 'node-' . str_replace('_', '-', $node->type);
+  $variables['template_files'][] = 'node-' . $node->nid;
 }
 
 /**