--- node.module.old	2006-03-01 02:00:13.000000000 +0100
+++ node.module	2006-03-01 17:35:49.000000000 +0100
@@ -571,7 +571,7 @@
 function node_show($node, $cid) {
   $output = node_view($node, FALSE, TRUE);
 
-  if (function_exists('comment_render') && $node->comment) {
+  if (variable_get('node_include_comments', 1) && function_exists('comment_render') && $node->comment) {
     $output .= comment_render($node, $cid);
   }
 
@@ -862,6 +862,11 @@
     '#type' => 'radios', '#title' => t('Preview post'), '#default_value' => variable_get('node_preview', 0),
     '#options' => array(t('Optional'), t('Required')), '#description' => t('Must users preview posts before submitting?')
   );
+  
+  $form['node_include_comments'] = array(
+  		'#type' => 'checkbox', '#title' => t('Include comments'), '#default_value' => variable_get('node_include_comments',1),
+  		'#description' => t('Comments are attached to the node-content')
+  	);
 
   return system_settings_form('node_configure', $form);
 }