diff --git a/ChangeLog b/ChangeLog
index d4cba24ea9..e2e63054eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 30 15:20:12 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/package.rb:  Load YAML for building gems.
+	* test/rubygems/test_gem_commands_contents_command.rb:  Sort expected
+	  output of default gem contents.  Re-fixes r38004 and r38005.
+
 Fri Nov 30 15:15:00 2012  Zachary Scott  <zachary@zacharyscott.net>
 
 	* vm_trace.c (set_trace_func): Formatting of params and events
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index 51df43be93..1769af061b 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -217,6 +217,7 @@ class Gem::Package
   # Builds this package based on the specification set by #spec=
 
   def build skip_validation = false
+    Gem.load_yaml
     require 'rubygems/security'
 
     @spec.validate unless skip_validation
diff --git a/test/rubygems/test_gem_commands_contents_command.rb b/test/rubygems/test_gem_commands_contents_command.rb
index 42e6053b21..60df53f53b 100644
--- a/test/rubygems/test_gem_commands_contents_command.rb
+++ b/test/rubygems/test_gem_commands_contents_command.rb
@@ -140,13 +140,13 @@ lib/foo.rb
       @cmd.execute
     end
 
-    expected = <<-EOF
-#{Gem::ConfigMap[:bindir]}/default_command
-#{Gem::ConfigMap[:rubylibdir]}/default/gem.rb
-#{Gem::ConfigMap[:archdir]}/default_gem.so
-    EOF
+    expected = %W[
+      #{Gem::ConfigMap[:bindir]}/default_command
+      #{Gem::ConfigMap[:rubylibdir]}/default/gem.rb
+      #{Gem::ConfigMap[:archdir]}/default_gem.so
+    ].sort.join "\n"
 
-    assert_equal expected, @ui.output
+    assert_equal expected, @ui.output.chomp
     assert_equal "", @ui.error
   end