diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d958bf..6fe8865 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Upgrading to this version is strongly recommended because of the OpenSSL upgrade
 
  * Added the following native extension gems: RedCloth, escape_utils, posix-spawn, nokogumbo, github-markdown, rugged, charlock_holmes, unf_ext.
  * Upgraded to OpenSSL 1.0.1l.
+ * The Linux version and the OS X version now use the same CA root certificates. Closes GH-24.
 
 ## Version 20141224
 
diff --git a/linux/internal/build-inside-mock b/linux/internal/build-inside-mock
index 79dade0..c8743ab 100755
--- a/linux/internal/build-inside-mock
+++ b/linux/internal/build-inside-mock
@@ -44,7 +44,7 @@ echo ORIG_RUBYOPT=\"$RUBYOPT\"
 echo ORIG_RUBYLIB=\"$RUBYLIB\"
 
 echo LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH:$ROOT/lib\"
-echo SSL_CERT_FILE=\"$ROOT/lib/cert.pem\"
+echo SSL_CERT_FILE=\"$ROOT/lib/ca-bundle.crt\"
 echo RUBYOPT=\"-r$ROOT/lib/restore_environment\"
 echo GEM_HOME=\"$ROOT/lib/ruby/gems/2.1.0\"
 echo GEM_PATH=\"$ROOT/lib/ruby/gems/2.1.0\"
@@ -153,9 +153,9 @@ run cp $LIBDIR/libz.so.1 /tmp/ruby/lib/
 run cp $LIBDIR/libtermcap.so.2 /tmp/ruby/lib/
 run cp $USRLIBDIR/libreadline.so.5 /tmp/ruby/lib/
 run cp $FFILIBDIR/libffi.so.6 /tmp/ruby/lib/
-run cp /etc/pki/tls/cert.pem /tmp/ruby/lib/
+run cp /system/ca-bundle.crt /tmp/ruby/lib/
 run cp /system/restore_environment.rb /tmp/ruby/lib/
-export SSL_CERT_FILE=/tmp/ruby/lib/cert.pem
+export SSL_CERT_FILE=/tmp/ruby/lib/ca-bundle.crt
 
 # Dump various information about the Ruby binaries.
 RUBY_COMPAT_VERSION=`/tmp/ruby/bin/ruby -rrbconfig -e 'puts RbConfig::CONFIG["ruby_version"]'`