diff --git a/ChangeLog b/ChangeLog
index 4d22496ce4..23f691e0d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 26 08:11:58 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* gem_prelude.rb: Reduce system calls by activating the `did_you_mean`
+	  gem before requiring the gem.  Activating the gem puts the gem on
+	  the load path, where simply requiring the file will search every gem
+	  that's installed until it can find a gem that contains the
+	  `did_you_mean` file.
+
 Thu Feb 25 19:04:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
 	* enc/unicode/case-folding.rb: Adding possibility for debugging output
diff --git a/gem_prelude.rb b/gem_prelude.rb
index 3f171d1145..be9c41933c 100644
--- a/gem_prelude.rb
+++ b/gem_prelude.rb
@@ -1,7 +1,8 @@
 if defined?(Gem)
   require 'rubygems.rb'
   begin
+    gem 'did_you_mean'
     require 'did_you_mean'
-  rescue LoadError
+  rescue Gem::LoadError, LoadError
   end if defined?(DidYouMean)
 end