diff --git a/man/footer b/man/footer
index a97065410e1369a993bd800d18001252a4c04749..3fd0a054894a397ddcfe73161fb159a9a061fa34 100644
--- a/man/footer
+++ b/man/footer
@@ -1,3 +1,4 @@
+.\" vim: ft=groff
 .SH "FILES"
 .PD 0
 .TP
diff --git a/man/lektor.template b/man/lektor.template
index 10bd44e9f8be6e229891843ea6b53a1e223a0756..e370f34ae1a9cb69aa8fc22a8804024c66aa0404 100644
--- a/man/lektor.template
+++ b/man/lektor.template
@@ -1,3 +1,4 @@
+.\" vim: ft=groff
 .TH "LEKTOR" "1" "___DATE___" "LEKTOR MK 7"
 .SH "NAME"
 
diff --git a/man/lektord.template b/man/lektord.template
index 47c88580e39bfec4fc1aeb4ef382ebf489c0b63c..b0bbbf15f58720ebba8deddf584f2a83152d7b45 100644
--- a/man/lektord.template
+++ b/man/lektord.template
@@ -1,3 +1,4 @@
+.\" vim: ft=groff
 .TH "LEKTORD" "1" "___DATE___" "LEKTOR MK 7"
 .SH "NAME"
 
diff --git a/man/lkt.old.template b/man/lkt.old.template
index 3ae343ed531cb4e09e830ab6283cb351a623ce87..68cef3a673d7572cac494e8ea24552b4b3a6baa4 100644
--- a/man/lkt.old.template
+++ b/man/lkt.old.template
@@ -1,12 +1,22 @@
-.TH "LKT" "1" "___DATE___" "LEKTOR MK 7"
+.\" vim: ft=groff
+.TH "LKT.OLD" "1" "___DATE___" "LEKTOR MK 7"
 .SH "NAME"
 
-lkt \- the lektor command line client
+lkt.old \- the old lektor command line client, kept for some back-compatibility issues
+
+.PP
+\fB/!\\ Deprecated /!\\\fP
 
 .SH "OVERVIEW"
-\fBlkt\fP is the \fBlektord\fP client, much like \fBmpc\fP but with
+\fBlkt.old\fP is the old \fBlektord\fP client, much like \fBmpc\fP but with
 more functionnalities like \fIplaylists\fP and \fIstickers\fP management.
 .PP
+Because \fBlkt.old\fP is replaced by \fBlkt\fP, its usage is deprecated in
+favor of \fBlkt\fP. The differences are the following:
+.IP \[bu] 2
+Some types in queries are optional. Thus the type is infered from the regex
+part and it means that some \fIqueries\fP are no longer possible.
+.PP
 Commands can be used with the minimal name that permit them to be
 distinguished from others commands. Thus, it is possible to use the
 string \fIadm\fP as an alias for \fIadmin\fP. This is like cisco switch
@@ -21,7 +31,7 @@ You may be interested in other related programs like:
 .PD
 
 .SH "COMMANDS"
-Here are the \fBlkt\fP commands:
+Here are the \fBlkt.old\fP commands:
 
 .PP
 \fIBASE-COMMANDS\fP
@@ -205,9 +215,9 @@ Prints to \fIstdout\fP the default configuration file
 .PP
 
 .SH "OPTIONS"
-Options can be passed to \fBlkt\fP before specifying the command in a
-\fIoption=value\fP format. This is done this way to allow one to make
-an alias of the \fBlkt\fP command.
+Options can be passed to \fBlkt.old\fP before specifying the command in a
+\fIoption=value\fP format. This is done this way to allow one to make an alias
+of the \fBlkt.old\fP command.
 .PP
 The possible options are the following:
 .PP
@@ -258,14 +268,14 @@ Select karas where the author is "kubat"
 .PP
 
 .SH "EXAMPLES"
-Valid invocations of the \fBlkt\fP command are the following:
+Valid invocations of the \fBlkt.old\fP command are the following:
 .PP
 .PD 0
 .TP
 .PD
-\fBlkt host=sakura port=6601 pwd=toto admin restart\fP
+\fBlkt.old host=sakura port=6601 pwd=toto admin restart\fP
 Restart the lektord daemon on the \fIsakura\fP PC. This daemon is listening on
 the port \fI6601\fP and the password of the admin user is \fItoto\fP
 .TP
-\fBlkt q a author krocoh\fP
+\fBlkt.old q a author krocoh\fP
 Add kara that Krocoh has done to the queue