diff --git a/configure.ac b/configure.ac
index 65052e8a6b..81e3a123eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -469,6 +469,7 @@ AC_CONFIG_FILES([Makefile \
       sourcedoc/Doxyfile \
       sourcedoc/Makefile \
       src/client/Makefile \
+      src/client/lyxclient.1:src/client/lyxclient.1in \
       src/Makefile \
       src/tex2lyx/Makefile \
       src/support/Makefile \
diff --git a/src/client/Makefile.am b/src/client/Makefile.am
index aff3a129a3..4844ef28ae 100644
--- a/src/client/Makefile.am
+++ b/src/client/Makefile.am
@@ -6,13 +6,10 @@ man_MANS = lyxclient.1
 
 bin_PROGRAMS = lyxclient
 
-EXTRA_DIST = lyxclient.man
+EXTRA_DIST = lyxclient.1in
 
 AM_CPPFLAGS += -I$(srcdir)/.. $(BOOST_INCLUDES)
 
-lyxclient.1:
-	cp -p $(srcdir)/lyxclient.man lyxclient.1
-
 lyxclient_LDADD = \
 	$(top_builddir)/src/support/liblyxsupport.a \
 	$(BOOST_LIBS) $(INTLLIBS) @LIBS@ $(SOCKET_LIBS) \
diff --git a/src/client/lyxclient.man b/src/client/lyxclient.1in
similarity index 92%
rename from src/client/lyxclient.man
rename to src/client/lyxclient.1in
index fb486b6718..fcabfed21e 100644
--- a/src/client/lyxclient.man
+++ b/src/client/lyxclient.1in
@@ -3,9 +3,9 @@
 .\"
 .\"  tbl lyxclient.1 | nroff -man | less
 .\"
-.TH LYXCLIENT 1 "Oct 2003" "Version 1.4" "lyxclient 1.4"
+.TH LYXCLIENT 1 "@LYX_DATE@" "Version @VERSION@" "lyxclient @VERSION@"
 .SH NAME
-lyxclient \- send commands to a running LyX editor
+lyxclient@program_suffix@ \- send commands to a running LyX editor
 .\"
 .\" setup
 .de Cr
@@ -13,7 +13,7 @@ lyxclient \- send commands to a running LyX editor
 .el \(co
 ..
 .SH SYNOPSIS
-\fBlyxclient\fR [ \fIoptions\fR ]
+\fBlyxclient@program_suffix@\fR [ \fIoptions\fR ]
 .br
 .SH DESCRIPTION
 When LyX starts, it creates a unique, per-process local socket in the
@@ -77,7 +77,7 @@ can be used to specify the socket special file that must be used.
 LyX sets this variable.
 It is overridden by the \fB\-a\fR option.
 .SH SEE ALSO
-lyx(1), xdvi(1), LFUNs.lyx.
+lyx@program_suffix@(1), xdvi(1), LFUNs.lyx.
 .SH AUTHORS
 Jo\[~a]o Luis M. Assirati <assirati@fma.if.usp.br> is the principal author
 of lyxclient.