diff --git a/root/usr/bin/samba-db-logd b/root/usr/bin/samba-db-logd
index b1dc650..89bb319 100755
--- a/root/usr/bin/samba-db-logd
+++ b/root/usr/bin/samba-db-logd
@@ -9,7 +9,7 @@ use strict;
 our %opts = ();
 
 # Set default options
-$opts{log} = '/var/log/smb_audit.log';
+$opts{log} = '/var/log/messages';
 $opts{debug} = 0;
 $opts{dbhost} = 'localhost';
 $opts{dbname} = 'samba_log';
diff --git a/root/var/service/samba-db-logd/run b/root/var/service/samba-db-logd/run
index 6b48c1b..f8a4459 100644
--- a/root/var/service/samba-db-logd/run
+++ b/root/var/service/samba-db-logd/run
@@ -7,10 +7,20 @@ my $dbname = $rec->prop('DbName') || 'samba_log';
 my $dbuser = $rec->prop('DbUser') || 'samba';
 my $dbpass = $rec->prop('DbPassword') || 'samba';
 my $dbhost = $rec->prop('DbHost') || 'localhost';
+my $log = '/var/log/messages';
+if (-e '/var/log/smb_audit.log') {
+    $log = '/var/log/smb_audit.log';
+}
+elsif ($rec->prop('LogFile')){
+    $log = $rec->prop('LogFile');
+}
+
 
 open(STDERR, ">&STDOUT");
 
-my @args = ("--debug=1", "--dbname=$dbname", "--dbuser=$dbuser", "--dbpass=$dbpass", "--exclude=opendir");
+my @args = ("--debug=1", "--dbname=$dbname", "--dbuser=$dbuser",
+            "--dbpass=$dbpass", "--exclude=opendir",
+            "--log=$log");
 
 push @args, "--dbhost=$dbhost" if ($dbhost ne 'localhost');