diff --git a/ChangeLog b/ChangeLog
index a8b3d322ca..72edd3398f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec 13 10:04:23 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/request_set/lockfile.rb:  Import RubyGems master a8d0669
+	  with a 1.8.7 compatibility fix.
+	* test/rubygems/test_gem_request_set_lockfile.rb:  ditto.
+
 Fri Dec 13 09:50:49 2013  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems:  Update to RubyGems master ddac51f.  Changes:
diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb
index 7ffb815716..522caf1502 100644
--- a/lib/rubygems/request_set/lockfile.rb
+++ b/lib/rubygems/request_set/lockfile.rb
@@ -448,7 +448,7 @@ class Gem::RequestSet::Lockfile
   # Peeks at the next token for Lockfile
 
   def peek # :nodoc:
-    @tokens.first || :EOF
+    @tokens.first || [:EOF]
   end
 
   def skip type # :nodoc:
diff --git a/test/rubygems/test_gem_request_set_lockfile.rb b/test/rubygems/test_gem_request_set_lockfile.rb
index 90e34d66a1..9e0cab4d1a 100644
--- a/test/rubygems/test_gem_request_set_lockfile.rb
+++ b/test/rubygems/test_gem_request_set_lockfile.rb
@@ -269,7 +269,7 @@ DEPENDENCIES
 
     assert_equal :token, @lockfile.get
 
-    assert_equal :EOF, @lockfile.peek
+    assert_equal [:EOF], @lockfile.peek
   end
 
   def test_skip