diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index d8b9f4d9..7854e5da 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -1348,6 +1348,14 @@ in
           A new module is available: 'programs.gradle'.
         '';
       }
+
+      {
+        time = "2023-12-28T08:28:26+00:00";
+        condition = hostPlatform.isLinux;
+        message = ''
+          A new module is available: 'services.osmscout-server'.
+        '';
+      }
     ];
   };
 }
diff --git a/modules/modules.nix b/modules/modules.nix
index 8f1b98a0..993c77ad 100644
--- a/modules/modules.nix
+++ b/modules/modules.nix
@@ -306,6 +306,7 @@ let
     ./services/nextcloud-client.nix
     ./services/notify-osd.nix
     ./services/opensnitch-ui.nix
+    ./services/osmscout-server.nix
     ./services/owncloud-client.nix
     ./services/pantalaimon.nix
     ./services/parcellite.nix
diff --git a/modules/services/osmscout-server.nix b/modules/services/osmscout-server.nix
new file mode 100644
index 00000000..e2de1491
--- /dev/null
+++ b/modules/services/osmscout-server.nix
@@ -0,0 +1,76 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.osmscout-server;
+in {
+  meta.maintainers = [ maintainers.Thra11 ];
+
+  options = {
+    services.osmscout-server = {
+      enable = mkEnableOption "OSM Scout Server";
+
+      package = mkPackageOption pkgs "osmscout-server" { };
+
+      network = {
+        startWhenNeeded = mkOption {
+          type = types.bool;
+          default = true;
+          description = ''
+            Enable systemd socket activation.
+          '';
+        };
+
+        listenAddress = mkOption {
+          type = types.str;
+          default = "127.0.0.1";
+          description = ''
+            The address for the server to listen on.
+          '';
+        };
+
+        port = mkOption {
+          type = types.port;
+          default = 8553;
+          description = ''
+            The TCP port on which the server will listen.
+          '';
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = [
+      (lib.hm.assertions.assertPlatform "services.osmscout-server" pkgs
+        lib.platforms.linux)
+    ];
+
+    systemd.user.services.osmscout-server = {
+      Unit = { Description = "OSM Scout Server"; };
+
+      Install = mkIf (!cfg.network.startWhenNeeded) {
+        WantedBy = [ "default.target" ];
+      };
+
+      Service = {
+        ExecStart = "'${cfg.package}/bin/osmscout-server' --systemd --quiet";
+      };
+    };
+
+    systemd.user.sockets.osmscout-server = mkIf cfg.network.startWhenNeeded {
+      Unit = { Description = "OSM Scout Server Socket"; };
+
+      Socket = {
+        ListenStream =
+          "${cfg.network.listenAddress}:${toString cfg.network.port}";
+        TriggerLimitIntervalSec = "60s";
+        TriggerLimitBurst = 1;
+      };
+
+      Install = { WantedBy = [ "sockets.target" ]; };
+    };
+
+    home.packages = [ cfg.package ];
+  };
+}
diff --git a/tests/default.nix b/tests/default.nix
index cebcf6c7..53458adb 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -235,6 +235,7 @@ import nmt {
     ./modules/services/mpd
     ./modules/services/mpd-mpris
     ./modules/services/mpdris2
+    ./modules/services/osmscout-server
     ./modules/services/pantalaimon
     ./modules/services/parcellite
     ./modules/services/pass-secret-service
diff --git a/tests/modules/services/osmscout-server/basic-setup.nix b/tests/modules/services/osmscout-server/basic-setup.nix
new file mode 100644
index 00000000..62333fb2
--- /dev/null
+++ b/tests/modules/services/osmscout-server/basic-setup.nix
@@ -0,0 +1,43 @@
+{ config, ... }:
+
+{
+  services.osmscout-server = {
+    enable = true;
+    package = config.lib.test.mkStubPackage { outPath = "@osmscout-server@"; };
+    network = {
+      startWhenNeeded = true;
+      listenAddress = "0.0.0.0";
+      port = 55555;
+    };
+  };
+
+  nmt.script = ''
+    assertFileContent \
+      home-files/.config/systemd/user/osmscout-server.service \
+      ${
+        builtins.toFile "osmscout-server.service" ''
+          [Service]
+          ExecStart='@osmscout-server@/bin/osmscout-server' --systemd --quiet
+
+          [Unit]
+          Description=OSM Scout Server
+        ''
+      }
+    assertFileContent \
+      home-files/.config/systemd/user/osmscout-server.socket \
+      ${
+        builtins.toFile "osmscout-server.socket" ''
+          [Install]
+          WantedBy=sockets.target
+
+          [Socket]
+          ListenStream=0.0.0.0:55555
+          TriggerLimitBurst=1
+          TriggerLimitIntervalSec=60s
+
+          [Unit]
+          Description=OSM Scout Server Socket
+        ''
+      }
+  '';
+}
diff --git a/tests/modules/services/osmscout-server/default.nix b/tests/modules/services/osmscout-server/default.nix
new file mode 100644
index 00000000..1acee0b8
--- /dev/null
+++ b/tests/modules/services/osmscout-server/default.nix
@@ -0,0 +1 @@
+{ osmscout-server = ./basic-setup.nix; }