diff --git a/includes/theme.inc b/includes/theme.inc
index 142226b8546b21a44e98418c671c467c40230509..5a7ac3722bde10f4c564361360bfd680e9279994 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -1965,7 +1965,8 @@ function template_preprocess_node(&$variables) {
     $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;
 }
 
 /**