diff --git a/root/usr/bin/samba-db-logd b/root/usr/bin/samba-db-logd
index c368681..2fe41fd 100755
--- a/root/usr/bin/samba-db-logd
+++ b/root/usr/bin/samba-db-logd
@@ -67,10 +67,24 @@ sub mysql_escape {
     return $string;
 }
 
+# Prepare query once
+sub prepare_query {
+    my $dbh = shift;
+    my $q = "INSERT INTO audit ".
+            "(samba_host,date_day,date_time,username,client_ip,client_name,".
+            "action,access_mode,status,share,file_src,file_dst)".
+            "VALUES(?,?,?,?,?,?,?,?,?,?,?,?);";
+    my $qh = $dbh->prepare($q);
+    return $qh;
+}
+
 my $dbh = db_connect;
+my $qh = prepare_query($dbh);
+
 # Open log file
 
 printlog("opening log file") if ($opts{debug} ge 1);
+
 my $tail = File::Tail->new(name=>$opts{log}, maxinterval=>15);
 
 while (defined(my $line=$tail->read)){
@@ -125,7 +139,6 @@ while (defined(my $line=$tail->read)){
 
     # MySQL escape
     # Shouldn't be needed, but just in case logs contains junk
-
     $username    = mysql_escape($username);
     $client_ip   = mysql_escape($client_ip);
     $client_name = mysql_escape($client_name);
@@ -149,21 +162,9 @@ while (defined(my $line=$tail->read)){
         printlog($msg);
     }
 
-    my $q = "INSERT INTO audit ".
-            "(samba_host,date_day,date_time,username,client_ip,client_name,".
-            "action,access_mode,";
-    $q .= "status,share,file_src";
-    $q .= ",file_dst" if (defined $file_dst);
-    $q .= ") VALUES('$host','$date','$time','$username','$client_ip','$client_name',".
-            "'$action','$access_mode'";
-    $q .= ",'$status','$share','$file_src'";
-    $q .= ",'$file_dst'" if (defined $file_dst);
-    $q .= ")";
-
-    printlog("Current query:\n$q\n") if ($opts{debug} ge 3);
-
-    my $qh = $dbh->prepare($q);
-    $qh->execute or exit(1);
+    $qh->execute($host,$date,$time,$username,$client_ip,$client_name,$action,
+                  $access_mode,$status,$share,$file_src,$file_dst) ||
+         die "Database error: ".$qh->errstr;
 }
 
 exit(0);