diff --git a/rpimonitor/rpimonitord b/rpimonitor/rpimonitord
index 1922a21..3d0af16 100755
--- a/rpimonitor/rpimonitord
+++ b/rpimonitor/rpimonitord
@@ -61,19 +61,14 @@ sub Load
   $_ = abs_path($0);
   my ($path,$file) = /(.*)\/([^\/]*)$/;
 
-=cut
-  if ( scalar(@{$this->{'daemon'}->{'confFiles'}}) == 0 ) {
-    @{$this->{'daemon'}->{'confFiles'}} = ( @{$this->{'daemon'}->{'confFiles'}}, glob "/etc/rpimonitor/*.conf" ) ;
-  }
+  push(@{$this->{'daemon'}->{'confFiles'}},"/etc/rpimonitor/data.conf");
+  push(@{$this->{'daemon'}->{'confFiles'}},"/etc/rpimonitor/daemon.conf");
 
   foreach ( @{$this->{'daemon'}->{'confFiles'}} ) {
+    #print "$_\n";
     $this->LoadFile($_);
   }
   delete($this->{'daemon'}->{'confFiles'});
-=cut
-
-  $this->LoadFile("/etc/rpimonitor/daemon.conf");
-  $this->LoadFile("/etc/rpimonitor/data.conf");
 
   # Set version (used by web pagescache mechanism)
   $this->{'version'} = localtime();