diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 14aa0762bc5e9e74a9fc87afa3da154258f1b11f..9d2b6dc4f25ce1f72462a2a0f2dcc073be4101f7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@
 CCK 6.2-dev
 ===========
 
+- #316656 Default weight must be zero, not NULL, or form ordering will be incorrect.
 - #107407 by dopry, optimization patch, do nothing in hook_form_alter() and hook_nodeapi() if there are no fields.
 - #317932 Fix userreference documentation typo.
 
diff --git a/includes/content.crud.inc b/includes/content.crud.inc
index 6e366268f1c75d1be95be994f95d6f2cb2139641..829604d6b3334883e9d330d1e8871508398c907e 100644
--- a/includes/content.crud.inc
+++ b/includes/content.crud.inc
@@ -109,7 +109,7 @@ function content_field_instance_expand($field) {
   }
   $field['widget'] = !empty($field['widget_settings']) ? $field['widget_settings'] : array();
   $field['widget']['label'] = !empty($field['label']) ? $field['label'] : $field['field_name'];
-  $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : NULL;
+  $field['widget']['weight'] = !empty($field['weight']) ? $field['weight'] : 0;
   $field['widget']['description'] = !empty($field['description']) ? $field['description'] : '';
 
   if (!empty($field['widget_type'])) {