diff --git a/lib/FjoSpidie/Controller/Job.pm b/lib/FjoSpidie/Controller/Job.pm
index 33c1e33..d7722b7 100644
--- a/lib/FjoSpidie/Controller/Job.pm
+++ b/lib/FjoSpidie/Controller/Job.pm
@@ -98,10 +98,12 @@ sub run {
 
     my @command = ( $command, "--url", "'$url'", "--uuid", $uuid );
     if ($referer) {
-        push( @command, "'$referer'" );
+        push( @command, "--referer" );
+        push( @command, "\\\"'$referer'\\\"" );
     }
     if ($ua) {
-        push( @command, "'$ua'" );
+        push( @command, "--useragent" );
+        push( @command, "\\\"'$ua'\\\"" );
     }
     eval {
         local $SIG{ALRM} = sub { die "timeout\n" };