diff --git a/AUTHORS.adoc b/AUTHORS.adoc
index 0c826d3db..b3a1f1d16 100644
--- a/AUTHORS.adoc
+++ b/AUTHORS.adoc
@@ -155,5 +155,4 @@ Alphabetically:
 
 == Contact
 
-See https://weechat.org/files/doc/devel/weechat_user.en.html#support[user's guide]
-or https://weechat.org/about/support
+See the https://weechat.org/about/support/[support page].
diff --git a/Contributing.adoc b/Contributing.adoc
index b7e8d457e..f3cf4fdc3 100644
--- a/Contributing.adoc
+++ b/Contributing.adoc
@@ -38,8 +38,7 @@ please include:
   problem here.
 * The *gdb's backtrace* (only for a crash): if you can reproduce the crash
   (or if you have a core file), please include the backtrace from gdb (look at
-  https://weechat.org/files/doc/devel/weechat_user.en.html#report_crashes[User's guide]
-  for more info).
+  https://weechat.org/doc/user#report_crashes[User's guide] for more info).
 * The *actual result*.
 * The *expected result*: the correct result you are expecting.
 
@@ -69,7 +68,7 @@ time, for https://github.com/weechat/weechat[WeeChat] and the website
 https://github.com/weechat/weechat.org[weechat.org].
 
 To start a translation in a new language (not yet supported), please look at
-https://weechat.org/files/doc/devel/weechat_dev.en.html#translations[translations]
+https://weechat.org/doc/dev#translations[translations]
 in Developer's guide.
 
 == Feature requests
@@ -85,6 +84,6 @@ For major new features, it's better to discuss about it in IRC
 (server: _irc.libera.chat_, channel _#weechat_).
 
 Before submitting any pull request, be sure you have read the
-https://weechat.org/files/doc/devel/weechat_dev.en.html#coding_rules[coding rules]
+https://weechat.org/doc/dev#coding_rules[coding rules]
 in Developer's guide, which contains info about styles used, naming convention
 and other useful info.
diff --git a/README.adoc b/README.adoc
index da71ea8cf..e0b821844 100644
--- a/README.adoc
+++ b/README.adoc
@@ -29,7 +29,7 @@ Homepage: https://weechat.org/
 * *Standards-compliant*: the IRC plugin is compliant with RFCs https://tools.ietf.org/html/rfc1459[1459], https://tools.ietf.org/html/rfc2810[2810], https://tools.ietf.org/html/rfc2811[2811], https://tools.ietf.org/html/rfc2812[2812], and https://tools.ietf.org/html/rfc2813[2813].
 * *Small, fast, and very light*: the core is and should stay as light and fast as possible.
 * *Customizable and extensible*: there are a lot of options to customize WeeChat, and it is extensible with C plugins and https://weechat.org/scripts/[scripts] (https://weechat.org/scripts/language/perl/[Perl], https://weechat.org/scripts/language/python/[Python], https://weechat.org/scripts/language/ruby[Ruby], https://weechat.org/scripts/language/lua/[Lua], https://weechat.org/scripts/language/tcl/[Tcl], https://weechat.org/scripts/language/guile/[Scheme], https://weechat.org/scripts/language/javascript/[JavaScript] and https://weechat.org/scripts/language/php/[PHP]).
-* *Fully documented*: there is comprehensive https://weechat.org/doc/[documentation], which is https://weechat.org/files/doc/stable/weechat_dev.en.html#translations[translated] into several languages.
+* *Fully documented*: there is comprehensive https://weechat.org/doc/[documentation], which is https://weechat.org/doc/dev#translations[translated] into several languages.
 * *Developed from scratch*: WeeChat was built from scratch and is not based on any other client.
 * *Free software*: WeeChat is released under https://www.gnu.org/licenses/gpl-3.0.html[GPLv3].
 
@@ -39,11 +39,9 @@ On WeeChat's website you can find https://weechat.org/about/screenshots/[more sc
 
 == Installation
 
-WeeChat can be installed using your favorite package manager (recommended)
-or by compiling it yourself.
+WeeChat can be installed using your favorite package manager (recommended) or by compiling it yourself.
 
-For detailed instructions, please check the
-https://weechat.org/files/doc/stable/weechat_user.en.html#install[WeeChat user's guide].
+For detailed instructions, please check the https://weechat.org/doc/user#install[WeeChat user's guide].
 
 == Copyright