diff --git a/docs/mirrors.md b/docs/mirrors.md
index 61ab93ae..9a991d0b 100644
--- a/docs/mirrors.md
+++ b/docs/mirrors.md
@@ -20,12 +20,14 @@ mirrors at [mirrors.alpinelinux.org](https://mirrors.alpinelinux.org) and
 ```
 $ pmbootstrap config mirrors.alpine http://uk.alpinelinux.org/alpine/
 $ pmbootstrap config mirrors.pmaports http://postmarketos.craftyguy.net/
+$ pmbootstrap config mirrors.systemd http://postmarketos.craftyguy.net/extra-repos/systemd/
 ```
 
 Reset to default works as with all config options:
 ```
 $ pmbootstrap config -r mirrors.alpine
 $ pmbootstrap config -r mirrors.pmaports
+$ pmbootstrap config -r mirrors.systemd
 ```
 
 ### Disable the postmarketOS mirror
@@ -49,4 +51,5 @@ you want to use in addition to the postmarketOS binary package repository.
 
 ```
 $ pmbootstrap config mirrors.pmaports_custom http://custom-repository-here
+$ pmbootstrap config mirrors.systemd_custom http://custom-repository-here/extra-repos/systemd
 ```
diff --git a/pmb/config/init.py b/pmb/config/init.py
index 8ec5981d..6ffb66d6 100644
--- a/pmb/config/init.py
+++ b/pmb/config/init.py
@@ -580,11 +580,7 @@ def ask_for_additional_options(config: Config) -> None:
     if pmb.helpers.cli.confirm("Change mirror?", default=False):
         mirror = ask_for_mirror()
         config.mirrors["pmaports"] = mirror
-        # FIXME: this path will change once the systemd repository is
-        # integrated into bpo (fixing this is a tasks in bpo#140)
-        # FIXME: when updating this, also add 'pmbootstrap config mirrors.systemd'
-        # examples to docs/mirrors.md
-        config.mirrors["systemd"] = os.path.join(mirror, "staging/systemd/")
+        config.mirrors["systemd"] = os.path.join(mirror, "extra-repos/systemd/")
 
 
 def ask_for_mirror() -> str:
diff --git a/pmb/core/config.py b/pmb/core/config.py
index a15c80cb..e917c15d 100644
--- a/pmb/core/config.py
+++ b/pmb/core/config.py
@@ -69,7 +69,7 @@ class Config:
         "pmaports_custom": "none",
         "pmaports": "http://mirror.postmarketos.org/postmarketos/",
         "systemd_custom": "none",
-        "systemd": "http://mirror.postmarketos.org/postmarketos/staging/systemd/",
+        "systemd": "http://mirror.postmarketos.org/postmarketos/extra-repos/systemd/",
     }
     qemu_redir_stdio: bool = False
     ssh_key_glob: str = "~/.ssh/*.pub"