diff --git a/ykval-common.php b/ykval-common.php
index 6e7395e..fd10d71 100644
--- a/ykval-common.php
+++ b/ykval-common.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once('ykval-log.php');
-
 define('S_OK', 'OK');
 define('S_BAD_OTP', 'BAD_OTP');
 define('S_REPLAYED_OTP', 'REPLAYED_OTP');
@@ -22,13 +20,9 @@ define('TS_ABS_TOLERANCE', 20);
 define('TOKEN_LEN', 32);
 define('OTP_MAX_LEN', 48); // TOKEN_LEN plus public identity of 0..16
 
-global $ykval_common_log;
-$ykval_common_log = new Log('ykval-common');
-
-function logdie ($str)
+function logdie ($logger, $str)
 {
-  global $ykval_common_log;
-  $ykval_common_log->log(LOG_INFO, $str);
+  $logger->log(LOG_INFO, $str);
   die($str . "\n");
 }
 
diff --git a/ykval-revoke.php b/ykval-revoke.php
index b1496df..53551d3 100644
--- a/ykval-revoke.php
+++ b/ykval-revoke.php
@@ -2,24 +2,28 @@
 require_once 'ykval-common.php';
 require_once 'ykval-config.php';
 require_once 'ykval-db.php';
+require_once 'ykval-log.php';
 
 header("content-type: text/plain");
 
+$myLog = new Log('ykval-revoke');
+$myLog->addField('ip', $_SERVER['REMOTE_ADDR']);
+
 if (!in_array ($_SERVER["REMOTE_ADDR"], $baseParams['__YKREV_IPS__'])) {
-  logdie("ERROR Authorization failed (logged ". $_SERVER["REMOTE_ADDR"] .")");
+  logdie($myLog, "ERROR Authorization failed (logged ". $_SERVER["REMOTE_ADDR"] .")");
 }
 
 # Parse input
 $yk = $_REQUEST["yk"];
 $do = $_REQUEST["do"];
 if (!$yk || !$do) {
-  logdie("ERROR Missing parameter");
+  logdie($myLog, "ERROR Missing parameter");
 }
 if (!preg_match("/^([cbdefghijklnrtuv]{0,16})$/", $yk)) {
-  logdie("ERROR Unknown yk value: $yk");
+  logdie($myLog, "ERROR Unknown yk value: $yk");
 }
 if ($do != "enable" && $do != "disable") {
-  logdie("ERROR Unknown do value: $do");
+  logdie($myLog, "ERROR Unknown do value: $do");
 }
 
 # Connect to db
@@ -29,21 +33,21 @@ $db = new Db($baseParams['__YKVAL_DB_DSN__'],
 	     $baseParams['__YKVAL_DB_OPTIONS__'],
 	     'ykval-revoke:db');
 if (!$db->connect()) {
-  logdie("ERROR Database connect error");
+  logdie($myLog, "ERROR Database connect error");
 }
 
 # Check if key exists
 $r = $db->findBy('yubikeys', 'yk_publicname', $yk, 1);
 if (!$r) {
-  logdie("ERROR Unknown yubikey: $yk");
+  logdie($myLog, "ERROR Unknown yubikey: $yk");
 }
 
 # Enable/Disable the yubikey
 if (!$db->updateBy('yubikeys', 'yk_publicname', $yk,
 		   array('active'=>($do == "enable" ? "1" : "0")))) {
-  logdie("ERROR Could not $do for $yk (rows $rows)");
+  logdie($myLog, "ERROR Could not $do for $yk (rows $rows)");
 }
 
 # We are done
-logdie("OK Processed $yk with $do");
+logdie($myLog, "OK Processed $yk with $do");
 ?>