.gitignore   |  1 +
 VERSION      |  1 -
 VERSION.do   |  2 ++
 clean.do     |  2 +-
 default.do   |  3 +--
 gogost.go    |  4 +---
 install.texi |  2 --
 makedist.sh  | 35 ++++++++++++++++++++++++++---------
 www.do       |  3 ++-

diff --git a/.gitignore b/.gitignore
index 6af4059e7fe813d6f480ce9795d6a20f1bbc81d55d898eb183905afbb902b627..9993e14ed853004f250ad4fdea0c3748d3ec58a58bead500e5c5bc29a1e65ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 module-name
+VERSION
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 66f2a752442fc764e44f203c55ad3ded2f621d3d55dbdc1f1ae3b57f325add6e..0000000000000000000000000000000000000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-5.0.0
diff --git a/VERSION.do b/VERSION.do
new file mode 100644
index 0000000000000000000000000000000000000000..83259bc7398b6b6ce508c3f6c44d2b611d3a9595f7c1583a986ee9417e71f6f5
--- /dev/null
+++ b/VERSION.do
@@ -0,0 +1,2 @@
+redo-ifchange gogost.go
+perl -ne 'print $1 if /Version.*"(.*)"$/' < gogost.go
diff --git a/clean.do b/clean.do
index 1634f9041f7be190da8d45b1994e1e5250e3c307b11fe5be8be6c2b6b8c1672e..0211ad84e2fa080f2549d47c134ca20537f83e44984482883132b8eaccc38111 100644
--- a/clean.do
+++ b/clean.do
@@ -1 +1 @@
-rm -f module-name streebog256 streebog512
+rm -f module-name streebog256 streebog512 VERSION
diff --git a/default.do b/default.do
index 3f02cdc948e0f4c68f0832839ef42cb453038f839057a0900d0489ebb823ade1..334956cd7108a09ab5386b80a6f7532f8c678617c71b582697d51bc51e7ee6d8 100644
--- a/default.do
+++ b/default.do
@@ -1,3 +1,2 @@
 redo-ifchange module-name
-MOD=`cat module-name`
-go build -o $3 -ldflags "-X ${MOD}.Version=`cat VERSION`" ${MOD}/cmd/$1
+go build -o $3 `cat module-name`/cmd/$1
diff --git a/gogost.go b/gogost.go
index 69241e5d0344a210a3794d987f58aa0abb1421cc12aab13e65a175f018f000a9..8c6f7ffb6e12c05f80abcb1d686436f17be39fd1dc779be1774248fd521d5169 100644
--- a/gogost.go
+++ b/gogost.go
@@ -1,6 +1,4 @@
 // Pure Go GOST cryptographic functions library.
 package gogost
 
-var (
-	Version string = "UNKNOWN"
-)
+const Version = "v5.0.1"
diff --git a/install.texi b/install.texi
index d45b3f93651f783d55dac2a76fb5f817b95c81110eea3d78e96d2d1208426e2f..6250cfb94ed252ff3adf5079828b683541eef3fc47cb713ccd786bb36f9a1da7 100644
--- a/install.texi
+++ b/install.texi
@@ -1,8 +1,6 @@
 @node Download
 @unnumbered Download
 
-@set VERSION 5.0.0
-
 Preferable way is to download tarball with the signature from
 website and, for example, run tests with benchmarks:
 
diff --git a/makedist.sh b/makedist.sh
index c686293f6617de2917aab64a6464791f994c0e5c011f89229970eb58fdfb713e..a384f35e522c8e6cf3ed7edb7a2077ec870a050c9c5055ce35710d432f984982 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -5,11 +5,12 @@ tmp=$(mktemp -d)
 release=$1
 [ -n "$release" ]
 
-redo-ifchange module-name streebog256
-mod_name=`cat module-name`
+redo-ifchange streebog256
 git clone . $tmp/gogost-$release
 cd $tmp/gogost-$release
 git checkout v$release
+redo module-name VERSION
+mod_name=`cat module-name`
 
 crypto_mod_path=$(sed -n 's#^require \(golang.org/x/crypto\) \(.*\)$#\1@\2#p' go.mod)
 mkdir -p src/$mod_name
@@ -26,10 +27,8 @@     mgm \
     prfplus \
     cmd internal gogost.go go.mod go.sum src/$mod_name
 
-rm module-name.do clean.do
 echo $mod_name > module-name
 find . -name "*.do" -exec perl -i -npe "s/^go/GOPATH=\`pwd\` go/" {} \;
-perl -i -npe "s/UNKNOWN/v$release/" src/$mod_name/gogost.go
 mkdir contrib
 cp ~/work/redo/minimal/do contrib/do
 
@@ -43,6 +42,13 @@ You can obtain releases source code prepared tarballs on
 @url{http://www.gogost.cypherpunks.ru/}.
 EOF
 
+mkinfo() {
+    ${MAKEINFO:-makeinfo} --plaintext \
+        --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
+        --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
+        -D "VERSION `cat VERSION`" $@
+}
+
 texi=$(mktemp)
 cat > $texi <<EOF
 \input texinfo
@@ -51,8 +57,7 @@ @settitle INSTALL
 @include install.texi
 @bye
 EOF
-makeinfo --plaintext -o INSTALL $texi
-rm $texi
+mkinfo --output INSTALL $texi
 
 cat > $texi <<EOF
 \input texinfo
@@ -61,7 +66,7 @@ @settitle NEWS
 @include news.texi
 @bye
 EOF
-makeinfo --plaintext -o NEWS $texi
+mkinfo --output NEWS $texi
 
 cat > $texi <<EOF
 \input texinfo
@@ -70,10 +75,21 @@ @settitle FAQ
 @include faq.texi
 @bye
 EOF
-makeinfo --plaintext -o FAQ $texi
+mkinfo --output FAQ $texi
 
 find . -name .git -type d | xargs rm -fr
-rm -f *.texi www.do style.css makedist.sh TODO .gitignore
+rm -fr .redo
+rm -f \
+    $texi \
+    *.texi \
+    .gitignore \
+    clean.do \
+    makedist.sh \
+    module-name.do \
+    style.css \
+    TODO \
+    VERSION.do \
+    www.do
 
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
@@ -163,3 +179,4 @@ https://lists.cypherpunks.ru/mailman/listinfo/gost
 EOF
 
 mv $tmp/$tarball $tmp/"$tarball".sig $cur/gogost.html/
+rm -fr $tmp
diff --git a/www.do b/www.do
index 60b5d933c4411333c7d8410ba73b65a7c2ba58c3a45b8a12e307b2868299a59f..93c18ceaa48b599069985839a990cae895a7aaf0c4250fdc5a1b4ba6f9e2b0d5 100644
--- a/www.do
+++ b/www.do
@@ -1,10 +1,11 @@
+redo-ifchange *.texi VERSION
 html=gogost.html
 rm -f $html/*.html
 ${MAKEINFO:-makeinfo} --html \
+    -D "VERSION `cat VERSION`" \
     --set-customization-variable EXTRA_HEAD='<link rev="made" href="mailto:webmaster@cypherpunks.ru">' \
     --set-customization-variable CSS_LINES="`cat style.css`" \
     --set-customization-variable SHOW_TITLE=0 \
-    --set-customization-variable USE_ACCESSKEY=0 \
     --set-customization-variable DATE_IN_HEADER=1 \
     --set-customization-variable TOP_NODE_UP_URL=index.html \
     --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \