5 files changed, 9 insertions, 4 deletions
diff --git a/extensions/UserProfile/Config.pm b/extensions/UserProfile/Config.pm
index 99dca9e02..99fae1610 100644
--- a/extensions/UserProfile/Config.pm
+++ b/extensions/UserProfile/Config.pm
@@ -6,7 +6,10 @@
 # defined by the Mozilla Public License, v. 2.0.
 
 package Bugzilla::Extension::UserProfile;
+
+use 5.10.1;
 use strict;
+use warnings;
 
 use constant NAME => 'UserProfile';
 use constant REQUIRED_MODULES => [ ];
diff --git a/extensions/UserProfile/Extension.pm b/extensions/UserProfile/Extension.pm
index 2c17a2d9f..079f7a948 100644
--- a/extensions/UserProfile/Extension.pm
+++ b/extensions/UserProfile/Extension.pm
@@ -7,6 +7,7 @@
 
 package Bugzilla::Extension::UserProfile;
 
+use 5.10.1;
 use strict;
 use warnings;
 
diff --git a/extensions/UserProfile/bin/migrate.pl b/extensions/UserProfile/bin/migrate.pl
index 147edef9c..2cde3ce2c 100755
--- a/extensions/UserProfile/bin/migrate.pl
+++ b/extensions/UserProfile/bin/migrate.pl
@@ -11,8 +11,8 @@ use strict;
 use warnings;
 $| = 1;
 
-use FindBin qw($Bin);
-use lib "$Bin/../../..";
+use FindBin qw($RealBin);
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/UserProfile/bin/update.pl b/extensions/UserProfile/bin/update.pl
index 2a4997aee..af9a81774 100755
--- a/extensions/UserProfile/bin/update.pl
+++ b/extensions/UserProfile/bin/update.pl
@@ -10,8 +10,8 @@
 use strict;
 use warnings;
 
-use FindBin qw($Bin);
-use lib "$Bin/../../..";
+use FindBin qw($RealBin);
+use lib ("$RealBin/../../..", "$RealBin/../../../lib", "$RealBin/../../../local/lib/perl5");
 
 use Bugzilla;
 BEGIN { Bugzilla->extensions() }
diff --git a/extensions/UserProfile/lib/Util.pm b/extensions/UserProfile/lib/Util.pm
index 71d0e6501..509b131c1 100644
--- a/extensions/UserProfile/lib/Util.pm
+++ b/extensions/UserProfile/lib/Util.pm
@@ -7,6 +7,7 @@
 
 package Bugzilla::Extension::UserProfile::Util;
 
+use 5.10.1;
 use strict;
 use warnings;