diff --git a/cmd/dkl-local-server/render-context.go b/cmd/dkl-local-server/render-context.go
index 7a756cb..0ede21a 100644
--- a/cmd/dkl-local-server/render-context.go
+++ b/cmd/dkl-local-server/render-context.go
@@ -12,12 +12,15 @@ import (
 	"text/template"
 
 	cfsslconfig "github.com/cloudflare/cfssl/config"
+	restful "github.com/emicklei/go-restful"
 	yaml "gopkg.in/yaml.v2"
 
 	"novit.nc/direktil/pkg/config"
 	"novit.nc/direktil/pkg/localconfig"
 )
 
+var cmdlineParam = restful.QueryParameter("cmdline", "Linux kernel cmdline addition")
+
 type renderContext struct {
 	Host      *localconfig.Host
 	SSLConfig string
@@ -34,7 +37,7 @@ func renderCtx(w http.ResponseWriter, r *http.Request, ctx *renderContext, what
 		return err
 	}
 
-	ctx.CmdLine = r.URL.Query().Get("cmdline")
+	ctx.CmdLine = r.URL.Query().Get(cmdlineParam.Data().Name)
 
 	if ctx.CmdLine != "" {
 		what = what + "?cmdline=" + url.QueryEscape(ctx.CmdLine)
diff --git a/cmd/dkl-local-server/ws-host.go b/cmd/dkl-local-server/ws-host.go
index edee5ef..955563e 100644
--- a/cmd/dkl-local-server/ws-host.go
+++ b/cmd/dkl-local-server/ws-host.go
@@ -12,11 +12,7 @@ import (
 	"novit.nc/direktil/pkg/localconfig"
 )
 
-var (
-	trustXFF = flag.Bool("trust-xff", true, "Trust the X-Forwarded-For header")
-
-	cmdlineParam = restful.QueryParameter("cmdline", "Linux kernel cmdline addition")
-)
+var trustXFF = flag.Bool("trust-xff", true, "Trust the X-Forwarded-For header")
 
 type wsHost struct {
 	prefix  string