diff --git a/ChangeLog b/ChangeLog
index c9295e47b2..5b2dbafedb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+
+	* lib/irb/locale.rb (IRB::Locale::#search_file):
+	  Gem might be undefined if --disable-gems. [ruby-core:34990]
+
 Mon Jan 31 04:45:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
diff --git a/lib/irb/locale.rb b/lib/irb/locale.rb
index 142b9a5951..77cc06ed30 100644
--- a/lib/irb/locale.rb
+++ b/lib/irb/locale.rb
@@ -147,7 +147,7 @@ module IRB
           full_path = File.join(libpath, lc_path)
           return full_path if File.readable?(full_path)
         end
-        redo if Gem.try_activate(lc_path)
+        redo if defined?(Gem) and Gem.try_activate(lc_path)
       end
       nil
     end
diff --git a/version.h b/version.h
index c3946aa95c..ced27ae8f0 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 184
+#define RUBY_PATCHLEVEL 185
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1