diff --git a/ChangeLog b/ChangeLog
index f878956556..2c8ad891d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb 15 12:30:46 2012  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/ostruct.rb: Create getters and setters after dup.
+	  [Bug #6028] [rubyspecs:0380bcc]
+
 Wed Feb 15 10:59:52 2012  Narihiro Nakamura  <authornari@gmail.com>
 
 	* gc.c (HEAP_BITMAP_LIMIT): HEAP_BITMAP_LIMIT is computed on the
diff --git a/lib/ostruct.rb b/lib/ostruct.rb
index a57eb08e7c..46c178c489 100644
--- a/lib/ostruct.rb
+++ b/lib/ostruct.rb
@@ -97,6 +97,7 @@ class OpenStruct
   def initialize_copy(orig)
     super
     @table = @table.dup
+    @table.each_key{|key| new_ostruct_member(key)}
   end
 
   #