diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
index 038d2cf26..3a4e5996b 100644
--- a/doc/man/date-of-man-include.am
+++ b/doc/man/date-of-man-include.am
@@ -1,6 +1,6 @@
 SED_PARAMETERS = \
 	-e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \
-	-e "s/%DISTR_VERSION%/@DISTR_VERSION@/g" \
+	-e "s/%MAN_VERSION%/@MAN_VERSION@/g" \
 	-e "s{%prefix%{@prefix@{g" \
 	-e "s{%sysconfdir%{@sysconfdir@{g" \
 	-e "s{%libexecdir%{@libexecdir@{g"
diff --git a/doc/man/es/mc.1.in b/doc/man/es/mc.1.in
index ed7371f86..5a93c69a4 100644
--- a/doc/man/es/mc.1.in
+++ b/doc/man/es/mc.1.in
@@ -6,7 +6,7 @@
 .\"	David H. Martín Alonso <david.martin@telefonica.net>
 .\"
 .\"TOPICS "Índice de Contenidos:"
-.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Versión %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Versión %MAN_VERSION%" "GNU Midnight Commander"
 .\"SKIP_SECTION"
 .SH "NOMBRE"
 mc \- entorno visual para sistemas tipo Unix.
diff --git a/doc/man/hu/mc.1.in b/doc/man/hu/mc.1.in
index ce9905d35..98e5cfaf3 100644
--- a/doc/man/hu/mc.1.in
+++ b/doc/man/hu/mc.1.in
@@ -1,6 +1,6 @@
 .\" -*- mode: troff; coding: UTF-8 -*-
 .\"TOPICS "Tartalomjegyzék"
-.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .\"SKIP_SECTION"
 .SH "NÉV"
 mc \- Fájlkezelő Unix típusú rendszerekhez
diff --git a/doc/man/it/mc.1.in b/doc/man/it/mc.1.in
index dc268b333..ae3596062 100644
--- a/doc/man/it/mc.1.in
+++ b/doc/man/it/mc.1.in
@@ -21,7 +21,7 @@
 .\" Prego mantenere la linea di traduzione generale (per quanto possibile).
 .\"
 .\"TOPICS "Indice degli argomenti:"
-.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .\"SKIP_SECTION"
 .SH "NOME"
 mc \- interfaccia visuale per sistemi tipo Unix.
diff --git a/doc/man/mc.1.in b/doc/man/mc.1.in
index ba6fea78a..c0c06e32f 100644
--- a/doc/man/mc.1.in
+++ b/doc/man/mc.1.in
@@ -1,6 +1,6 @@
 .\" -*- mode: troff; coding: UTF-8 -*-
 .\"TOPICS "Topics:"
-.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .\"SKIP_SECTION"
 .SH "NAME"
 mc \- Visual shell for Unix\-like systems.
diff --git a/doc/man/mcedit.1.in b/doc/man/mcedit.1.in
index 39019ac8d..73187fd0a 100644
--- a/doc/man/mcedit.1.in
+++ b/doc/man/mcedit.1.in
@@ -1,4 +1,4 @@
-.TH MCEDIT 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MCEDIT 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .SH NAME
 mcedit \- Internal file editor of GNU Midnight Commander.
 .SH SYNOPSIS
diff --git a/doc/man/mcview.1.in b/doc/man/mcview.1.in
index 877f88ea2..703b7c3a0 100644
--- a/doc/man/mcview.1.in
+++ b/doc/man/mcview.1.in
@@ -1,4 +1,4 @@
-.TH MCVIEW 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MCVIEW 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .SH NAME
 mcview \- Internal file viewer of GNU Midnight Commander.
 .SH SYNOPSIS
diff --git a/doc/man/pl/mc.1.in b/doc/man/pl/mc.1.in
index af1042e47..558f86b2a 100644
--- a/doc/man/pl/mc.1.in
+++ b/doc/man/pl/mc.1.in
@@ -1,6 +1,6 @@
 .\" -*- mode: troff; coding: UTF-8 -*-
 .\"Przetłumaczone przez by Macieja Wojciechowskiego    wojciech@staszic.waw.pl
-.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .\"SKIP_SECTION"
 .SH NAZWA
 mc \- wizualny interpetator poleceń dla systemów Unixopodobnych
diff --git a/doc/man/ru/mc.1.in b/doc/man/ru/mc.1.in
index 9becbc6d7..d4823acce 100644
--- a/doc/man/ru/mc.1.in
+++ b/doc/man/ru/mc.1.in
@@ -1,7 +1,7 @@
 .\" -*- mode: troff; coding: UTF-8 -*-
 .\"TOPICS "Разделы помощи:"
 .\" TODO: Перевести раздел EXTernal File System
-.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %DISTR_VERSION%" "GNU Midnight Commander"
+.TH MC 1 "%DATE_OF_MAN_PAGE%" "MC Version %MAN_VERSION%" "GNU Midnight Commander"
 .\"SKIP_SECTION"
 .SH "НАИМЕНОВАНИЕ"
 mc \- Визуальная оболочка для Unix\-подобных систем.
diff --git a/doc/man/sr/mc.1.in b/doc/man/sr/mc.1.in
index 18f7ebd6d..d1611d34c 100644
--- a/doc/man/sr/mc.1.in
+++ b/doc/man/sr/mc.1.in
@@ -1,6 +1,6 @@
 .\" -*- mode: troff; coding: UTF-8 -*-
 .\"TOPICS "Теме:"
-.TH ПН 1 "%DATE_OF_MAN_PAGE%" "ПН верзија %DISTR_VERSION%" "ГНУ\-ов поноћни наредник"
+.TH ПН 1 "%DATE_OF_MAN_PAGE%" "ПН верзија %MAN_VERSION%" "ГНУ\-ов поноћни наредник"
 .\"SKIP_SECTION"
 .SH "НАЗИВ"
 mc \- Визуална љуска за Униксолике системе.
diff --git a/m4.include/mc-version.m4 b/m4.include/mc-version.m4
index 885ca0619..51b6b77c4 100644
--- a/m4.include/mc-version.m4
+++ b/m4.include/mc-version.m4
@@ -3,7 +3,7 @@ dnl
 dnl Get current version of Midnight Commander from git tags
 dnl
 dnl @author Slava Zanko <slavazanko@gmail.com>
-dnl @version 2021-03-28
+dnl @version 2021-04-04
 dnl @license GPL
 dnl @copyright Free Software Foundation, Inc.
 dnl @modified Andrew Borodin <aborodin@vmail.ru>
@@ -16,7 +16,6 @@ AC_DEFUN([mc_VERSION],[
     fi
 
     dnl Version without dashes for the man page
-    DISTR_VERSION=`echo $VERSION | sed 's/^\([[^\-]]*\).*/\1/'`
-
-    AC_SUBST(DISTR_VERSION)
+    MAN_VERSION=`echo $VERSION | sed 's/^\([[^\-]]*\).*/\1/'`
+    AC_SUBST(MAN_VERSION)
 ])