diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 4e62adf97c4d..4c777c2bd4c7 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -645,6 +645,8 @@
   [is removed](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c01f664e4ca210823b7594b50669bbd9b0a3c3b0)
   in Linux 6.13.
 
+- `services.geoclue2` now uses [beaconDB](https://beacondb.net/) as a default geolocation service, replacing Mozilla Location Services which was [retired in June 2024](https://github.com/mozilla/ichnaea/issues/2065).
+
 - `authelia` version 4.39.0 has made some changes which deprecate older configurations.
   They are still expected to be working until future version 5.0.0, but will generate warnings in logs.
   Read the [release notes](https://www.authelia.com/blog/4.39-release-notes/) for human readable summaries of the changes.
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 16d1cb17ca06..f7878ae93bf3 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -138,7 +138,7 @@ in
 
       geoProviderUrl = lib.mkOption {
         type = lib.types.str;
-        default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue";
+        default = "https://api.beacondb.net/v1/geolocate";
         example = "https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY";
         description = ''
           The url to the wifi GeoLocation Service.
@@ -168,7 +168,7 @@ in
 
       submissionUrl = lib.mkOption {
         type = lib.types.str;
-        default = "https://location.services.mozilla.com/v1/submit?key=geoclue";
+        default = "https://api.beacondb.net/v2/geosubmit";
         description = ''
           The url to submit data to a GeoLocation Service.
         '';