diff --git a/COMPILE.md b/COMPILE.md
index 4609ac318..0313d0b87 100644
--- a/COMPILE.md
+++ b/COMPILE.md
@@ -7,7 +7,7 @@ from source code.
For a more detailed explanation, please check the
ejabberd Docs: [Source Code Installation][docs-source].
-[docs-source]: https://docs.ejabberd.im/admin/installation/#source-code
+[docs-source]: https://docs.ejabberd.im/admin/install/source/
Requirements
diff --git a/CONTAINER.md b/CONTAINER.md
index 9fa5492b8..6fbb12534 100644
--- a/CONTAINER.md
+++ b/CONTAINER.md
@@ -29,7 +29,7 @@ repository.
Check the [differences between `ejabberd` and `ecs` images](https://github.com/processone/docker-ejabberd/blob/master/ecs/HUB-README.md#alternative-image-in-github).
If you are using a Windows operating system, check the tutorials mentioned in
-[ejabberd Docs > Docker Image](https://docs.ejabberd.im/admin/installation/#docker-image).
+[ejabberd Docs > Docker Image](https://docs.ejabberd.im/admin/install/container/#ejabberd-container-image).
Start ejabberd
@@ -108,7 +108,7 @@ docker exec -it ejabberd ejabberdctl register admin localhost passw0rd
```
Then edit conf/ejabberd.yml and add the ACL as explained in
-[ejabberd Docs: Administration Account](https://docs.ejabberd.im/admin/installation/#administration-account)
+[ejabberd Docs: Administration Account](https://docs.ejabberd.im/admin/install/next-steps/#administration-account)
### Check ejabberd log files
diff --git a/Makefile.in b/Makefile.in
index 103fa38a7..34728f66a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -258,7 +258,7 @@ _build/edoc/docs.md: edoc_compile
> _build/edoc/docs.md
_build/edoc/logo.png: edoc_compile
- wget https://docs.ejabberd.im/static/shared/images/footer_logo_e.png -O _build/edoc/logo.png
+ wget https://docs.ejabberd.im/assets/img/footer_logo_e.png -O _build/edoc/logo.png
#.
#' copy-files
diff --git a/README.md b/README.md
index 15817f666..b307277ac 100644
--- a/README.md
+++ b/README.md
@@ -109,14 +109,14 @@ and [ejabberd translations](https://github.com/processone/ejabberd-po/) under MI
[erlang]: https://www.erlang.org/
[features]: https://docs.ejabberd.im/admin/introduction/
[fluux]: https://fluux.io/
-[homebrew]: https://docs.ejabberd.im/admin/installation/#homebrew
+[homebrew]: https://docs.ejabberd.im/admin/install/homebrew/
[hubecs]: https://hub.docker.com/r/ejabberd/ecs/
[im]: https://ejabberd.im/
[issues]: https://github.com/processone/ejabberd/issues
[localization]: https://docs.ejabberd.im/developer/extending-ejabberd/localization/
[mqtt]: https://mqtt.org/
[muc]: xmpp:ejabberd@conference.process-one.net
-[osp]: https://docs.ejabberd.im/admin/installation/#operating-system-packages
+[osp]: https://docs.ejabberd.im/admin/install/os-package/
[p1contact]: https://www.process-one.net/en/company/contact/
[p1download]: https://www.process-one.net/en/ejabberd/downloads/
[p1home]: https://www.process-one.net/en/ejabberd/
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
index f34887f66..d81bd0f6e 100644
--- a/src/ejabberd_web_admin.erl
+++ b/src/ejabberd_web_admin.erl
@@ -625,7 +625,7 @@ maybe_disclaimer_not_admin(MenuItems, AJID, Lang) ->
{[_], []} ->
[?XREST(?T("Apparently your account has no administration rights in this server. "
"Please check how to grant admin rights in: "
- "https://docs.ejabberd.im/admin/installation/#administration-account"))
+ "https://docs.ejabberd.im/admin/install/next-steps/#administration-account"))
];
_ ->
[]
diff --git a/tools/generate-doap.sh b/tools/generate-doap.sh
index fb146599f..74de66134 100755
--- a/tools/generate-doap.sh
+++ b/tools/generate-doap.sh
@@ -48,7 +48,7 @@ write_doap_head()
-
+
diff --git a/tools/make-installers b/tools/make-installers
index ee0ee1ed1..e1c7c47eb 100755
--- a/tools/make-installers
+++ b/tools/make-installers
@@ -67,7 +67,7 @@ rel_vsn=$(git describe --tags | sed -e 's/-g.*//' -e 's/-/./' | tr -d '[:space:]
home_url='https://www.ejabberd.im'
doc_url='https://docs.ejabberd.im'
upgrade_url="$doc_url/admin/upgrade/#specific-version-upgrade-notes"
-admin_url="$doc_url/admin/installation/#administration-account"
+admin_url="$doc_url/admin/install/next-steps/#administration-account"
default_code_dir="/opt/$rel_name-$rel_vsn"
default_data_dir="/opt/$rel_name"
tmp_dir=$(mktemp -d "/tmp/.$rel_name.XXXXXX")