diff --git a/cmd/flamenco-manager/main.go b/cmd/flamenco-manager/main.go
index ac4850ac..b8b42737 100644
--- a/cmd/flamenco-manager/main.go
+++ b/cmd/flamenco-manager/main.go
@@ -54,6 +54,7 @@ import (
 )
 
 var cliArgs struct {
+	debug           bool
 	version         bool
 	writeConfig     bool
 	delayResponses  bool
@@ -297,8 +298,12 @@ func buildWebService(
 	// limitations in Go that get in our way here.
 
 	// Hook Zerolog onto Echo:
+	lechoSetters := []lecho.Setter{}
+	if cliArgs.debug {
+		lechoSetters = append(lechoSetters, lecho.WithCaller())
+	}
 	e.Use(lecho.Middleware(lecho.Config{
-		Logger: lecho.From(log.Logger),
+		Logger: lecho.From(log.Logger, lechoSetters...),
 	}))
 
 	// Ensure panics when serving a web request won't bring down the server.
@@ -512,6 +517,8 @@ func parseCliArgs() {
 
 	flag.Parse()
 
+	cliArgs.debug = debug || trace
+
 	var logLevel zerolog.Level
 	switch {
 	case trace: