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-13 09:34:04.844477140 +0200
@@ -22,8 +22,15 @@
 use Scmbug::Daemon::Bugtracker;
 use Scmbug::Common;
 use Scmbug::VDD;
-use List::MoreUtils qw(firstidx);
+use File::Spec;
+
+BEGIN {
+	use Scmbug::Daemon::Daemon();
+	use lib Scmbug::Daemon::Daemon->daemon_configuration->{ bugtracker }->{ installation_directory };
+	use lib File::Spec->catdir( Scmbug::Daemon::Daemon->daemon_configuration->{ bugtracker }->{ installation_directory }, 'lib' );
+}
 
+use List::MoreUtils qw(firstidx);
 
 my $bugzilla_bug_status_map = {
     "ASSIGNED" => { name => "ASSIGNED",
@@ -220,13 +227,6 @@
     my $package_name = "";
     my $package_version = "";
 
-    # Include the bugzilla libraries
-    unshift @INC, $self->installation_directory();
-    chdir $self->installation_directory();
-
-    if ( $self->is_version_gte( $VERSION_3_2_0 ) ) {
-        unshift @INC, $self->installation_directory() . "/lib";
-    }
 
     #
     # Require DBI version 1.50 on Windows. Earlier versions have
diff -Naur scmbug.old1/lib/Scmbug/Daemon/Daemon.pm scmbug/lib/Scmbug/Daemon/Daemon.pm
--- scmbug.old1/lib/Scmbug/Daemon/Daemon.pm	2011-02-09 04:15:49.000000000 +0200
+++ scmbug/lib/Scmbug/Daemon/Daemon.pm	2011-03-13 09:11:58.840478871 +0200
@@ -19,7 +19,7 @@
 use Scmbug::VDD;
 use Scmbug::Daemon::Request;
 use Scmbug::Daemon::Integration;
-use Scmbug::Daemon::Bugzilla;
+#use Scmbug::Daemon::Bugzilla;
 use Scmbug::Daemon::Mantis;
 use Scmbug::Daemon::RequestTracker;
 use Scmbug::Daemon::TestDirector;
@@ -88,6 +88,7 @@
     # Instantiate a bugtracker object according to the type of
     # bug-tracking tool used
     if ( $daemon_configuration->{ bugtracker }->{ type } eq "Bugzilla" ) {
+	eval "use Scmbug::Daemon::Bugzilla"; # dynamic loading is important for use lib
 	$bugtracker = Scmbug::Daemon::Bugzilla->new( $daemon_configuration->{ bugtracker } );
 	$bugtracker->installed_locally( $daemon_configuration->{ bugtracker }->{ installed_locally } );
 	$bugtracker->installation_directory( $daemon_configuration->{ bugtracker }->{ installation_directory } );
@@ -681,6 +682,13 @@
     log_daemon_warn( $request, "Connection from $connection_host_name processed\n" );
 }
 
+#
+# Daemon configuration - static method accessible at compile time (e.g. in use lib)
+#
+sub daemon_configuration {
+	my $type = shift;
 
+	return $daemon_configuration;
+}
 
 1;
