diff --git a/ChangeLog b/ChangeLog
index 5939259994..5e63c49cd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 24 12:08:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/delegate.rb (marshal_dump/load): dump & load instance variables
+	  by default [ruby-core:24211]
+
 Thu Dec 24 10:31:50 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
 	* lib/object.c (rb_obj_cmp): Default <=> operator returns 0 if
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 77804e47ff..f8a71f1863 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -183,10 +183,16 @@ class Delegator
 
   # Serialization support for the object returned by \_\_getobj\_\_.
   def marshal_dump
-    __getobj__
+    [
+      instance_variables,
+      instance_variables.map{|var| instance_variable_get(var)},
+      __getobj__
+    ]
   end
   # Reinitializes delegation from a serialized object.
   def marshal_load(obj)
+    vars, values, obj = obj
+    vars.each_with_index{|var, i| instance_variable_set(var, values[i])}
     __setobj__(obj)
   end