diff -upNr excerpt/excerpt.module excerpt.new/excerpt.module
--- excerpt/excerpt.module	2007-08-10 02:33:37.000000000 +0200
+++ excerpt.new/excerpt.module	2007-08-10 02:33:52.000000000 +0200
@@ -23,32 +21,28 @@ function excerpt_nodeapi(&$node, $op, $a
   }
 }
 
-function excerpt_form_alter($form_id, &$form) {
-  if (isset($form['type'])) {
-    $node = $form['#node'];
-    
-    if ($form['type']['#value'] .'_node_settings' == $form_id) {
-      $form['excerpt'] = array('#type' => 'fieldset', '#title' => t('Excerpt'));
-      $form['excerpt']['excerpt_options_'. $form['type']['#value']] = array(
-        '#type' => 'radios',
-        '#title' => t('Teasers'),
-        '#default_value' => variable_get('excerpt_options_'. $form['type']['#value'], 1),
-        '#options' => array(t('Auto-generated'), t('Manual excerpt')),
-        '#description' => t('Choose whether teasers are generated automatically or can be entered manually by the author.')
-      );
-    }
+function excerpt_form_alter($form_id, &$form) {  
+  if ($form_id == 'node_type_form') {
+    $form['workflow']['excerpt']['excerpt_options'] = array(
+      '#type' => 'radios',
+      '#title' => t('Teasers'),
+      '#default_value' => variable_get('excerpt_options_'. $form['#node_type']->type, 1),
+      '#options' => array(t('Auto-generated'), t('Manual excerpt')),
+      '#description' => t('Choose whether teasers are generated automatically or can be entered manually by the author.')
+    );
+  }
     
-    if ($form['type']['#value'] .'_node_form' == $form_id && variable_get('excerpt_options_'. $node->type, 1)) {
+  if (isset($form['type'])) {
+    if ($form['type']['#value'] .'_node_form' == $form_id && variable_get('excerpt_options_'. $form['type']['#value'], 1)) {
       $form['teaser'] = array(
         '#type' => 'textarea',
         '#title' => t('Teaser'),
-        '#default_value' => $node->teaser,
+        '#default_value' => $form['#node']->teaser,
         '#cols' => 60,
         '#rows' => 5,
-        '#weight' => -17.5,
+        '#weight' => -1,
         '#description' => t('Enter an excerpt for this item. It will be shown on listing pages along with a <em>read more</em> link which leads to the full view. Leave empty to auto-generate one from the body.')
       );
-    }
-  
+    } 
   }
 }