diff --git a/logger.go b/logger.go
index 4e4eb532d..54b3c1aba 100644
--- a/logger.go
+++ b/logger.go
@@ -6,21 +6,16 @@ import (
 	"os"
 )
 
-var debugEnabled = true
-var logger = log.New(os.Stderr, "", log.Lshortfile|log.Ltime)
+var logger = log.New(os.Stderr, "", log.Ltime)
 
 func debugln(vals ...interface{}) {
-	if debugEnabled {
-		s := fmt.Sprintln(vals...)
-		logger.Output(2, "DEBUG: "+s)
-	}
+	s := fmt.Sprintln(vals...)
+	logger.Output(2, "DEBUG: "+s)
 }
 
 func debugf(format string, vals ...interface{}) {
-	if debugEnabled {
-		s := fmt.Sprintf(format, vals...)
-		logger.Output(2, "DEBUG: "+s)
-	}
+	s := fmt.Sprintf(format, vals...)
+	logger.Output(2, "DEBUG: "+s)
 }
 
 func infoln(vals ...interface{}) {
diff --git a/main.go b/main.go
index 3cd43e813..7b0647510 100644
--- a/main.go
+++ b/main.go
@@ -32,6 +32,7 @@ type Options struct {
 }
 
 type DebugOptions struct {
+	LogSource bool   `long:"log-source"`
 	TraceFile bool   `long:"trace-file"`
 	TraceNet  bool   `long:"trace-net"`
 	TraceIdx  bool   `long:"trace-idx"`
@@ -71,13 +72,13 @@ var (
 )
 
 func main() {
-	// Useful for debugging; to be adjusted.
-	log.SetFlags(log.Ltime | log.Lshortfile)
-
 	_, err := flags.Parse(&opts)
 	if err != nil {
 		os.Exit(0)
 	}
+	if opts.Debug.TraceFile || opts.Debug.TraceIdx || opts.Debug.TraceNet || opts.Debug.LogSource {
+		logger = log.New(os.Stderr, "", log.Lshortfile|log.Ldate|log.Ltime|log.Lmicroseconds)
+	}
 	if strings.HasPrefix(opts.ConfDir, "~/") {
 		opts.ConfDir = strings.Replace(opts.ConfDir, "~", getHomeDir(), 1)
 	}