Index: sites/all/modules/webform/webform.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/webform.module,v
retrieving revision 1.209
diff -u -r1.209 webform.module
--- sites/all/modules/webform/webform.module	27 Mar 2010 18:21:02 -0000	1.209
+++ sites/all/modules/webform/webform.module	27 Mar 2010 23:50:25 -0000
@@ -1143,7 +1143,7 @@
     '#page' => $page,
     '#form' => $form,
     '#enabled' => $enabled,
-    '#weight' => 10,
+    '#weight' => field_extra_field_weight('node', $node->type, 'webform'),
   );
 }
 
@@ -2819,6 +2819,21 @@
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function webform_field_extra_fields() {
+  $extra = array();
+  foreach (webform_variable_get('webform_node_types') as $type) {
+    $extra['node'][$type]['webform'] = array(
+      'label' => t('Webform'),
+      'description' => t('Webform client form.'),
+      'weight' => 10,
+    );
+  }
+  return $extra;
+}
+
+/**
  * Implements hook_mollom_form_list().
  */
 function webform_mollom_form_list() {