diff --git a/ykval-export-clients.php b/ykval-export-clients.php
new file mode 100755
index 0000000..f0b8a2d
--- /dev/null
+++ b/ykval-export-clients.php
@@ -0,0 +1,40 @@
+#!/usr/bin/php
+<?php
+
+set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/ykval:/etc/ykval");
+
+require_once 'ykval-config.php';
+require_once 'ykval-db.php';
+
+
+$logname="ykval-export";
+$myLog = new Log($logname);
+
+$db=new Db($baseParams['__YKVAL_DB_DSN__'],
+	   $baseParams['__YKVAL_DB_USER__'],
+	   $baseParams['__YKVAL_DB_PW__'],
+	   $baseParams['__YKVAL_DB_OPTIONS__'], 
+	   $logname . ':db');
+
+if (!$db->connect()) {
+  $myLog->log(LOG_WARNING, "Could not connect to database");
+  exit(1);
+ }  
+
+$result = $db->customQuery("select id, active, created, secret, email, notes, otp from clients order by id");
+while($row = $result->fetch(PDO::FETCH_ASSOC)){
+  echo $row['id'] .
+    "\t" . $row['active'] .
+    "\t" . $row['created'] .
+    "\t" . $row['secret'] .
+    "\t" . $row['email'] .
+    "\t" . $row['notes'] .
+    "\t" . $row['otp'] .
+    "\n";
+ }
+
+$result=null;
+$db=null;
+
+
+?>
diff --git a/ykval-import-clients.php b/ykval-import-clients.php
new file mode 100755
index 0000000..abc525a
--- /dev/null
+++ b/ykval-import-clients.php
@@ -0,0 +1,60 @@
+#!/usr/bin/php
+<?php
+
+set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/ykval:/etc/ykval");
+
+require_once 'ykval-config.php';
+require_once 'ykval-db.php';
+
+
+$logname="ykval-import";
+$myLog = new Log($logname);
+
+$db=new Db($baseParams['__YKVAL_DB_DSN__'],
+	   $baseParams['__YKVAL_DB_USER__'],
+	   $baseParams['__YKVAL_DB_PW__'],
+	   $baseParams['__YKVAL_DB_OPTIONS__'], 
+	   $logname . ':db');
+
+if (!$db->connect()) {
+  $myLog->log(LOG_WARNING, "Could not connect to database");
+  error_log("Could not connect to database");
+  exit(1);
+ }  
+
+
+while ($res=fgetcsv(STDIN, 0, "\t")) {
+  $params=array("id"=>$res[0], 
+		"active"=>$res[1], 
+		"created"=>$res[2], 
+		"secret"=>$res[3], 
+		"email"=>$res[4], 
+		"notes"=>$res[5], 
+		"otp"=>$res[6]);
+  
+  
+  $query="SELECT * FROM clients WHERE id='" . $params['id'] . "'";
+  $result=$db->customQuery($query);
+  if(!$result->fetch(PDO::FETCH_ASSOC)) {
+    // We didn't have the id in database so we need to do insert instead
+    $query="INSERT INTO clients " .
+      "(id,active,created,secret,email,notes,otp) VALUES " .
+      "('" . $params["id"] . "', " .
+      "'" . $params["active"] . "', " .
+      "'" . $params['created'] . "'," .
+      "'" . $params['secret'] . "'," .
+      "'" . $params['email'] . "'," .
+      "'" . $params['notes'] . "'," .
+      "'" . $params['otp'] . "')";
+    
+    if(!$db->customQuery($query)){
+      $myLog->log(LOG_ERR, "Failed to insert new client with query " . $query);
+      error_log("Failed to insert new client with query " . $query);
+      exit(1);
+    }
+  }
+ }
+
+
+$myLog->log(LOG_NOTICE, "Successfully imported clients to database");
+echo "Successfully imported clients to database\n";