diff --git a/Netdisco/bin/nd-dbic-versions b/Netdisco/bin/nd-dbic-versions
index 0e4148c9..a41e4e15 100755
--- a/Netdisco/bin/nd-dbic-versions
+++ b/Netdisco/bin/nd-dbic-versions
@@ -1,9 +1,17 @@
 #!/usr/bin/env perl
 
 use FindBin;
-use lib "$FindBin::Bin/../lib";
-use App::Netdisco;
+FindBin::again();
+use Path::Class 'dir';
 
+BEGIN {
+  # stuff useful locations into @INC
+  unshift @INC,
+    dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
+    dir($FindBin::RealBin, 'lib')->stringify;
+}
+
+use App::Netdisco;
 use Dancer ':script';
 use Dancer::Plugin::DBIC 'schema';
 
diff --git a/Netdisco/bin/nd-import-topology b/Netdisco/bin/nd-import-topology
index f549fef7..35469c2a 100755
--- a/Netdisco/bin/nd-import-topology
+++ b/Netdisco/bin/nd-import-topology
@@ -1,9 +1,17 @@
 #!/usr/bin/env perl
 
 use FindBin;
-use lib "$FindBin::Bin/../lib";
-use App::Netdisco;
+FindBin::again();
+use Path::Class 'dir';
 
+BEGIN {
+  # stuff useful locations into @INC
+  unshift @INC,
+    dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
+    dir($FindBin::RealBin, 'lib')->stringify;
+}
+
+use App::Netdisco;
 use Dancer ':script';
 use Dancer::Plugin::DBIC 'schema';
 
diff --git a/Netdisco/bin/netdisco-db-deploy b/Netdisco/bin/netdisco-db-deploy
index ea75fbef..db95fbb5 100755
--- a/Netdisco/bin/netdisco-db-deploy
+++ b/Netdisco/bin/netdisco-db-deploy
@@ -1,9 +1,17 @@
 #!/usr/bin/env perl
 
 use FindBin;
-use lib "$FindBin::Bin/../lib";
-use App::Netdisco;
+FindBin::again();
+use Path::Class 'dir';
 
+BEGIN {
+  # stuff useful locations into @INC
+  unshift @INC,
+    dir($FindBin::RealBin)->parent->subdir('lib')->stringify,
+    dir($FindBin::RealBin, 'lib')->stringify;
+}
+
+use App::Netdisco;
 use Dancer ':script';
 use Dancer::Plugin::DBIC 'schema';