diff --git a/ChangeLog b/ChangeLog
index f2c3cfb1d9..b05abadebb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 16 12:09:51 2012  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
+	  other architectures than x86_64. Fixes #6873.
+
 Wed Aug 15 19:37:33 2012  Yuki Yugui Sonoda  <yugui@google.com>
 
 	* configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy
diff --git a/nacl/pepper_main.c b/nacl/pepper_main.c
index 25087e995a..c0e497b387 100644
--- a/nacl/pepper_main.c
+++ b/nacl/pepper_main.c
@@ -26,7 +26,9 @@
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
 
+#include "verconf.h"
 #include "ruby/ruby.h"
+#include "version.h"
 #include "gc.h"
 
 #ifdef HAVE_STRUCT_PPB_CORE
@@ -339,8 +341,8 @@ pruby_post_value(void* data)
 static void
 init_loadpath(void)
 {
-  ruby_incpush("lib/ruby/2.0.0");
-  ruby_incpush("lib/ruby/2.0.0/x86_64-nacl");
+  ruby_incpush("lib/ruby/"RUBY_LIB_VERSION);
+  ruby_incpush("lib/ruby/"RUBY_LIB_VERSION"/"RUBY_PLATFORM);
   ruby_incpush(".");
 }