diff --git a/build/groups/groupsbase.page.php b/build/groups/groupsbase.page.php
index ec48703a9a..d7cc320a76 100644
--- a/build/groups/groupsbase.page.php
+++ b/build/groups/groupsbase.page.php
@@ -245,7 +245,7 @@ protected function getSubmenuItems()
         } else {
             $items[] = [ 'search', 'groups/search', $words->getSilent('GroupsSearchHeading') ];
             $items[] = [ 'rules', 'forums/rules', $words->getSilent('ForumRulesShort') ];
-            $items[] = [ 'faq', 'about/faq/6', $words->getSilent('ForumLinkToDoc') ];
+            $items[] = [ 'faq', 'faq/6', $words->getSilent('ForumLinkToDoc') ];
         }
 
         $items[] = [ 'subscription', 'forums/subscriptions', $this->words->getSilent('forum_YourSubscription') ];
diff --git a/src/Controller/AboutBaseController.php b/src/Controller/AboutBaseController.php
index e03c508ce6..23a5c3d507 100644
--- a/src/Controller/AboutBaseController.php
+++ b/src/Controller/AboutBaseController.php
@@ -15,7 +15,7 @@ protected function getSubMenuItems(string $locale): array
             ],
             'about_faq' => [
                 'key' => 'Faq',
-                'url' => $this->generateUrl('about_faq'),
+                'url' => $this->generateUrl('faqs_overview'),
             ],
             'about_feedback' => [
                 'key' => 'ContactUs',
diff --git a/src/Controller/FaqController.php b/src/Controller/FaqController.php
index 53573a5210..b03f8b5464 100644
--- a/src/Controller/FaqController.php
+++ b/src/Controller/FaqController.php
@@ -22,13 +22,16 @@ public function __construct(FaqModel $faqModel)
     }
 
     /**
+     * Old FAQ address, kept for external links and bookmarks. Permanent, so search engines
+     * move it to /faq (BeWelcome/sysadmins-infra#654).
+     *
      * @Route("/about/faq", name="about_faq")
      *
      * @return Response
      */
     public function showAboutFAQ()
     {
-        return $this->redirectToRoute('faqs_overview', ['categoryId' => 1]);
+        return $this->redirectToRoute('faqs_overview', [], Response::HTTP_MOVED_PERMANENTLY);
     }
 
     /**
diff --git a/templates/footer.html.twig b/templates/footer.html.twig
index f5189565ac..7729b8dc16 100644
--- a/templates/footer.html.twig
+++ b/templates/footer.html.twig
@@ -48,7 +48,7 @@
                             </h2>
                             <ul class="list-unstyled stickyfooter__link-list stickyfooter__link-list--legal mb-0">
                                 <li><a href="{{ url('about') }}">{{ 'aboutuspage' | trans }}</a></li>
-                                <li><a href="{{ url('about_faq') }}">{{ 'faq' | trans }}</a></li>
+                                <li><a href="{{ url('faqs_overview') }}">{{ 'faq' | trans }}</a></li>
                                 <li><a href="{{ url('feedback') }}">{{ 'contactus' | trans }}</a></li>
                                 <li><a href="{{ url('feedback', { IdCategory: 1, RequestURI: url('homepage')}) }}">{{ 'footer.reportbug' | trans }}</a></li>
                                 {% if app.user %}
diff --git a/templates/landing/landing.html.twig b/templates/landing/landing.html.twig
index 6caed6da37..d41717c35a 100644
--- a/templates/landing/landing.html.twig
+++ b/templates/landing/landing.html.twig
@@ -337,7 +337,7 @@
         <a href="{{ url('about') }}"
            class="o-button btn o-button text-truncate u-mb-8"><i
             class="fa u-mr-8 fa-question mr-2"></i>{{ 'landing.beinformed.about' | trans }}</a>
-        <a href="{{ url('about_faq') }}"
+        <a href="{{ url('faqs_overview') }}"
            class="o-button btn o-button text-truncate u-mb-8"><i
             class="fa u-mr-8 fa-question mr-2"></i>{{ 'landing.beinformed.faq' | trans }}</a>
         <a href="{{ url('safety') }}"
diff --git a/templates/search/searchmap.html.twig b/templates/search/searchmap.html.twig
index cfe39bfad8..2a915d59a9 100644
--- a/templates/search/searchmap.html.twig
+++ b/templates/search/searchmap.html.twig
@@ -73,7 +73,7 @@
                 <a href="{{ url('privacy_policy') }}" target="new">{{ 'privacy' | trans }}</a> •
                 <a href="{{ url('data_rights') }}" target="new">{{ 'datarights' | trans }}</a> •
                 <a href="{{ url('imprint') }}">{{ 'impressum' | trans }}</a> •
-                <a href="{{ url('about_faq') }}">{{ 'faq' | trans }}</a> •
+                <a href="{{ url('faqs_overview') }}">{{ 'faq' | trans }}</a> •
                 <a href="{{ url('feedback') }}">{{ 'footer.contactus' | trans }}</a> •
                 <a href="{{ url('feedback', {'IdCategory': 1, 'RequestUri': url('homepage')}) }}">{{ 'footer.reportbug' | trans }}</a><br>
                 &copy;2007