cmds.texi => doc/cmds.texi           |  0 
 download.texi => doc/download.texi   |  0 
 faq.texi => doc/faq.texi             |  0 
 features.texi => doc/features.texi   |  0 
 goredo.info.do => doc/goredo.info.do |  4 ++--
 goredo.texi => doc/goredo.texi       |  0 
 install.texi => doc/install.texi     |  2 +-
 makedist.sh                          | 13 ++++++++-----
 news.texi => doc/news.texi           |  0 
 notes.texi => doc/notes.texi         |  0 
 state.texi => doc/state.texi         |  0 

diff --git a/cmds.texi b/doc/cmds.texi
rename from cmds.texi
rename to doc/cmds.texi
diff --git a/download.texi b/doc/download.texi
rename from download.texi
rename to doc/download.texi
diff --git a/faq.texi b/doc/faq.texi
rename from faq.texi
rename to doc/faq.texi
diff --git a/features.texi b/doc/features.texi
rename from features.texi
rename to doc/features.texi
diff --git a/goredo.info.do b/doc/goredo.info.do
rename from goredo.info.do
rename to doc/goredo.info.do
index fd8c856ab6453defb5bd6e8740dd05e5096254111545d97010f88f1cf3a75a2d..eb6e5fd1180e0b2974aceb65b44ed7de3d7e6854bf1d7dfda6a73cca4e8685b4 100644
--- a/goredo.info.do
+++ b/doc/goredo.info.do
@@ -1,6 +1,6 @@
-redo-ifchange *.texi VERSION
+redo-ifchange *.texi ../VERSION
 ${MAKEINFO:-makeinfo} \
-    -D "VERSION `cat VERSION`" \
+    -D "VERSION `cat ../VERSION`" \
     --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
     --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
     --output $3 goredo.texi
diff --git a/goredo.texi b/doc/goredo.texi
rename from goredo.texi
rename to doc/goredo.texi
diff --git a/install.texi b/doc/install.texi
rename from install.texi
rename to doc/install.texi
index 1f4c34b4e655b5f482d8a87ef639de2c86c496ec89ba97af94157fd0831014d8..7c7e9b415b431040f41925e70121af1b74efaf9ad8498a07a9f6a6ef606cf2cb 100644
--- a/install.texi
+++ b/doc/install.texi
@@ -40,7 +40,7 @@ $ gpg --auto-key-locate wkd --locate-keys goredo at cypherpunks dot ru
 @end example
 
 @item
-@verbatiminclude PUBKEY.asc
+@verbatiminclude ../PUBKEY.asc
 
 @end itemize
 
diff --git a/makedist.sh b/makedist.sh
index a034781d2b8b2282b41e0e1585336aab9b426ab4e870460916f7d7841774a32d..3b995aeae7a734e15fc3d43d170dddf0a62a747062d770fa40c89e3da7032075 100755
--- a/makedist.sh
+++ b/makedist.sh
@@ -13,17 +13,17 @@ redo-ifchange module-name VERSION
 mod_name=`cat module-name`
 
 ########################################################################
+cd doc
 cat > download.texi <<EOF
 You can obtain releases source code prepared tarballs on
 @url{http://www.goredo.cypherpunks.ru/}.
 EOF
-redo goredo.info
 
 mkinfo() {
     ${MAKEINFO:-makeinfo} --plaintext \
         --set-customization-variable CLOSE_QUOTE_SYMBOL=\" \
         --set-customization-variable OPEN_QUOTE_SYMBOL=\" \
-        -D "VERSION `cat VERSION`" $@
+        -D "VERSION `cat ../VERSION`" $@
 }
 
 texi=$(mktemp)
@@ -46,10 +46,13 @@ @settitle INSTALL
 @include install.texi
 @bye
 EOF
-perl -i -p -e "s/.verbatiminclude PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
+perl -i -p -e "s/.verbatiminclude .*PUBKEY.asc/Look in PUBKEY.asc file./" install.texi
 mkinfo --output INSTALL $texi
 
 rm $texi
+redo goredo.info
+mv goredo.info NEWS INSTALL ..
+cd ..
 
 ########################################################################
 
@@ -98,7 +101,7 @@ mv $tmp/golang.org src
 
 ########################################################################
 
-rm -rf *.texi .redo .git .gitignore makedist.sh goredo.info.do module-name* VERSION.do
+rm -rf *.texi .redo .git .gitignore doc makedist.sh module-name* VERSION.do
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
 
@@ -119,7 +122,7 @@ @tab @url{download/goredo-${release}.tar.zst, link} @url{download/goredo-${release}.tar.zst.sig, sign}
 @tab @code{$hash}
 EOF
 
-mv $tmp/$tarball $tmp/"$tarball".sig $cur/goredo.html/download
+mv $tmp/$tarball $tmp/"$tarball".sig $cur/doc/goredo.html/download
 
 cat <<EOF
 Subject: goredo $release release announcement
diff --git a/news.texi b/doc/news.texi
rename from news.texi
rename to doc/news.texi
diff --git a/notes.texi b/doc/notes.texi
rename from notes.texi
rename to doc/notes.texi
diff --git a/state.texi b/doc/state.texi
rename from state.texi
rename to doc/state.texi