diff -Naur scmbug.old1/lib/Scmbug/Daemon/Bugzilla.pm scmbug/lib/Scmbug/Daemon/Bugzilla.pm
--- scmbug.old1/lib/Scmbug/Daemon/Bugzilla.pm	2011-03-12 02:17:28.929248281 +0200
+++ scmbug/lib/Scmbug/Daemon/Bugzilla.pm	2011-03-12 15:07:16.664473061 +0200
@@ -22,7 +22,7 @@
 use Scmbug::Daemon::Bugtracker;
 use Scmbug::Common;
 use Scmbug::VDD;
-use List::MoreUtils qw(firstidx);
+use File::Spec;
 
 
 my $bugzilla_bug_status_map = {
@@ -220,12 +220,15 @@
     my $package_name = "";
     my $package_version = "";
 
-    # Include the bugzilla libraries
-    unshift @INC, $self->installation_directory();
     chdir $self->installation_directory();
 
+    # Include the bugzilla libraries
+    my $inst_dir = $self->installation_directory();
+    eval "use lib \"$inst_dir\"";
+
     if ( $self->is_version_gte( $VERSION_3_2_0 ) ) {
-        unshift @INC, $self->installation_directory() . "/lib";
+        my $inst_lib_dir = File::Spec->catdir( $inst_dir, 'lib' );
+        eval "use lib \"$inst_lib_dir\"";
     }
 
     #
@@ -325,6 +328,7 @@
 	}
 
         # Must load the Bugzilla package before any of its functions are used.
+        eval "use List::MoreUtils qw(firstidx)";
         eval "use Bugzilla";
         eval "use Bugzilla::BugMail";
     }