diff --git a/Netdisco/Changes b/Netdisco/Changes
index 637198c6..d0743451 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,9 +1,13 @@
-2.025002 -
+2.026001_001 -
 
   [ENHANCEMENTS]
 
   * Add FRU filter option to Module Inventory Report
 
+  [BUG FIXES]
+
+  * Search for localenv could not find $HOME
+
 2.025001 - 2014-04-08
 
   [NEW FEATURES]
diff --git a/Netdisco/bin/nd-import-topology b/Netdisco/bin/nd-import-topology
index 4efe218e..f4d8fe63 100755
--- a/Netdisco/bin/nd-import-topology
+++ b/Netdisco/bin/nd-import-topology
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
diff --git a/Netdisco/bin/netdisco-daemon b/Netdisco/bin/netdisco-daemon
index 37764b2f..1a96bb62 100755
--- a/Netdisco/bin/netdisco-daemon
+++ b/Netdisco/bin/netdisco-daemon
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
diff --git a/Netdisco/bin/netdisco-db-deploy b/Netdisco/bin/netdisco-db-deploy
index 455e9d32..b174485b 100755
--- a/Netdisco/bin/netdisco-db-deploy
+++ b/Netdisco/bin/netdisco-db-deploy
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
diff --git a/Netdisco/bin/netdisco-deploy b/Netdisco/bin/netdisco-deploy
index 8ef43626..3119e898 100755
--- a/Netdisco/bin/netdisco-deploy
+++ b/Netdisco/bin/netdisco-deploy
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
diff --git a/Netdisco/bin/netdisco-do b/Netdisco/bin/netdisco-do
index 79c2ce2c..3b0113a4 100755
--- a/Netdisco/bin/netdisco-do
+++ b/Netdisco/bin/netdisco-do
@@ -1,11 +1,16 @@
 #!/usr/bin/env perl
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+use strict;
+use warnings;
+
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
diff --git a/Netdisco/bin/netdisco-rancid-export b/Netdisco/bin/netdisco-rancid-export
index 33f90f61..36ee6313 100755
--- a/Netdisco/bin/netdisco-rancid-export
+++ b/Netdisco/bin/netdisco-rancid-export
@@ -1,11 +1,16 @@
 #!/usr/bin/env perl
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+use strict;
+use warnings;
+
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;
diff --git a/Netdisco/bin/netdisco-web b/Netdisco/bin/netdisco-web
index 49535ac3..402da1f0 100755
--- a/Netdisco/bin/netdisco-web
+++ b/Netdisco/bin/netdisco-web
@@ -3,12 +3,14 @@
 use strict;
 use warnings;
 
-our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+our $home;
 
 BEGIN {
   use FindBin;
   FindBin::again();
 
+  $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
+
   # try to find a localenv if one isn't already in place.
   if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
       use File::Spec;