diff --git a/lib/smsd/cli.rb b/lib/smsd/cli.rb
index 3e9ab6e..886a539 100644
--- a/lib/smsd/cli.rb
+++ b/lib/smsd/cli.rb
@@ -35,10 +35,11 @@ module SMSd
 
     def init_logger
       @logger = Logger.new(
-        Util::MultiIO.new(STDOUT, File.open('debug.log', 'a')))
+        Util::MultiIO.new(STDOUT,
+                          File.open(@options[:logfile] || 'smsd.log', 'a')))
 
       logger.formatter = proc do |severity, datetime, progrname, msg|
-        "#{datetime} [#{severity}] #{msg}\n"
+        "#{$PROGRAM_NAME}: #{datetime} [#{severity}] #{msg}\n"
       end
     end
 
diff --git a/lib/smsd/cli/options.rb b/lib/smsd/cli/options.rb
index b4e6df4..86d80b3 100644
--- a/lib/smsd/cli/options.rb
+++ b/lib/smsd/cli/options.rb
@@ -17,6 +17,10 @@ module SMSd
             options[:daemonize] = daemon
           end
 
+          opts.on('-l', '--log-file', 'Define log file') do |logfile|
+            options[:logfile] = logfile
+          end
+
           opts.on('-p', '--pin PIN', 'Specify the SIM PIN') do |pin|
             options[:pin] = pin
           end