diff --git a/tools/mesh/beacon-udp.pl b/tools/mesh/beacon-udp.pl
index 52a227c..a3fbfdd 100755
--- a/tools/mesh/beacon-udp.pl
+++ b/tools/mesh/beacon-udp.pl
@@ -7,7 +7,9 @@ use POSIX qw(strftime);
 #use Time::HiRes qw(time);
 use Digest::CRC qw(crcccitt);
 
-use lib '.';
+use FindBin;
+use lib "$FindBin::Bin/lib";
+
 use r0ket;
 
 $|=1;
diff --git a/tools/mesh/beacontrace.pl b/tools/mesh/beacontrace.pl
index fe90f61..8b71c66 100755
--- a/tools/mesh/beacontrace.pl
+++ b/tools/mesh/beacontrace.pl
@@ -7,7 +7,8 @@ use Curses;
 use POSIX qw(strftime);
 use Time::HiRes qw(time);
 
-use lib '.';
+use FindBin;
+use lib "$FindBin::Bin/lib";
 use r0ket;
 
 $|=1;
diff --git a/tools/mesh/r0ket.pm b/tools/mesh/lib/r0ket.pm
similarity index 100%
rename from tools/mesh/r0ket.pm
rename to tools/mesh/lib/r0ket.pm
diff --git a/tools/mesh/meshtrace.pl b/tools/mesh/meshtrace.pl
index 2788083..2ba2a33 100755
--- a/tools/mesh/meshtrace.pl
+++ b/tools/mesh/meshtrace.pl
@@ -6,7 +6,8 @@ use strict;
 use Curses;
 use POSIX qw(strftime);
 
-use lib '.';
+use FindBin;
+use lib "$FindBin::Bin/lib";
 use r0ket;
 
 $|=1;
diff --git a/tools/mesh/rf b/tools/mesh/rf
index 5bf5b17..ccc5894 100755
--- a/tools/mesh/rf
+++ b/tools/mesh/rf
@@ -9,7 +9,7 @@ use Digest::CRC qw(crcccitt);
 use POSIX qw(strftime);
 
 use FindBin;
-use lib "$FindBin::Bin";
+use lib "$FindBin::Bin/lib";
 use r0ket;
 
 $|=1;