diff -ru Mail-Mbox-MessageParser-1.5105.orig/lib/Mail/Mbox/MessageParser/Config.pm Mail-Mbox-MessageParser-1.5105/lib/Mail/Mbox/MessageParser/Config.pm
--- Mail-Mbox-MessageParser-1.5105.orig/lib/Mail/Mbox/MessageParser/Config.pm	2015-05-03 05:44:19.000000000 +0300
+++ Mail-Mbox-MessageParser-1.5105/lib/Mail/Mbox/MessageParser/Config.pm	2015-10-21 00:10:46.000000000 +0300
@@ -8,14 +8,14 @@
 
 %Mail::Mbox::MessageParser::Config = (
   'programs' => {
-    'bzip' => '/usr/bin/bzip2',
-    'bzip2' => '/usr/bin/bzip2',
-    'cat' => '/usr/local/opt/coreutils/libexec/gnubin/cat',
+    'bzip' => '/bin/bzip2',
+    'bzip2' => '/bin/bzip2',
+    'cat' => '/bin/cat',
     'diff' => '/usr/bin/diff',
-    'grep' => undef,
-    'gzip' => '/usr/bin/gzip',
-    'lzip' => '/usr/local/bin/lzip',
-    'xz' => '/usr/local/bin/xz',
+    'grep' => '/bin/grep',
+    'gzip' => '/bin/gzip',
+    'lzip' => '/usr/bin/lzip',
+    'xz' => '/usr/bin/xz',
   },
 
   'max_testchar_buffer_size' => 1048576,
diff -ru Mail-Mbox-MessageParser-1.5105.orig/lib/Mail/Mbox/MessageParser/MetaInfo.pm Mail-Mbox-MessageParser-1.5105/lib/Mail/Mbox/MessageParser/MetaInfo.pm
--- Mail-Mbox-MessageParser-1.5105.orig/lib/Mail/Mbox/MessageParser/MetaInfo.pm	2015-04-18 19:59:08.000000000 +0300
+++ Mail-Mbox-MessageParser-1.5105/lib/Mail/Mbox/MessageParser/MetaInfo.pm	2015-10-21 00:03:24.000000000 +0300
@@ -29,18 +29,7 @@
 
 #-------------------------------------------------------------------------------
 
-sub _LOAD_STORABLE
-{
-  if (eval 'require Storable;')
-  {
-    import Storable;
-    return 1;
-  }
-  else
-  {
-    return 0;
-  }
-}
+use Storable;
 
 #-------------------------------------------------------------------------------
 
@@ -50,10 +39,6 @@
 
   carp "Need file_name option" unless defined $cache_options->{'file_name'};
 
-  return "Can not load " . __PACKAGE__ . ": Storable is not installed.\n"
-    unless _LOAD_STORABLE();
-  
-  # Load Storable if we need to
   # See if the client is setting up a different cache
   if (exists $CACHE_OPTIONS{'file_name'} &&
     $cache_options->{'file_name'} ne $CACHE_OPTIONS{'file_name'})