diff --git a/NEWS b/NEWS
index 0153c3e..75ac72f 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,10 @@
 
   * Added a working ykval-config.php that looks for a ksm on localhost.
 
+  * Removed System_Daemon dependency and made ykval-queue a simple
+    backgroundable process that can be daemonized using for instance
+    and init.d script.
+
 * Version 2.19 released 2012-07-05
 
   * Refactor database code, allowing for other underlying implementations
diff --git a/ykval-queue.php b/ykval-queue.php
index 605c205..e080697 100755
--- a/ykval-queue.php
+++ b/ykval-queue.php
@@ -1,56 +1,18 @@
 #!/usr/bin/php
 <?php
 
-if ($argc==2 && strcmp($argv[1], "help")==0) {
-  echo "\nUsage:\n\n";
-  echo $argv[0] . " install  \t- Installs start scripts for daemon\n";
-  echo $argv[0] . " file     \t- Starts sync daemon. file is sourced and can include for example path configuration\n";
-  echo "\n";
-  exit();
- }
-if ($argc==2 && strcmp($argv[1], "install")!=0) {
-  set_include_path(get_include_path() . PATH_SEPARATOR . $argv[1]);
- }
-
-require_once "System/Daemon.php";
-
-$appname="ykval-queue";
-
-System_Daemon::setOption("appName", $appname);
-System_Daemon::setOption("appDescription", "Yubico val-server sync daemon");
-System_Daemon::setOption("authorName", "olov@yubico.com");
-System_Daemon::setOption("authorEmail", "olov@yubico.com");
-
-if ($argc==2 && strcmp($argv[1], "install")==0) {
-  $autostart_path = System_Daemon::writeAutoRun();
-  if ($autostart_path!=1){
-    echo "Successfully created start script at " . $autostart_path . "\n";
-    echo "To start daemon use: /etc/init.d/".$appname." start\n";
-  } else {
-    echo "Start script already created\n";
-    echo "To start daemon use: /etc/init.d/".$appname." start\n";
-  }
-  exit();
- }
+set_include_path(get_include_path() . PATH_SEPARATOR . "/usr/share/yubikey-val:/etc/yubico/val");
 
 require_once 'ykval-synclib.php';
 require_once 'ykval-config.php';
 require_once 'ykval-log.php';
 
-System_Daemon::start();                           // Spawn Deamon!
-/* Application start */
-
 $sl = new SyncLib('ykval-queue:synclib');
 
 # Loop forever and resync
-
-$res==0;
-while ($res==0) {
+do {
   $sl->reSync($baseParams['__YKVAL_SYNC_OLD_LIMIT__'],
 	      $baseParams['__YKVAL_SYNC_RESYNC_TIMEOUT__']);
-  $res=sleep($baseParams['__YKVAL_SYNC_INTERVAL__']);
- }
-
-System_Daemon::stop();
+} while(sleep($baseParams['__YKVAL_SYNC_INTERVAL__'])==0);
 
 ?>