diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
new file mode 100644
index 000000000000..1d96209ed89d
--- /dev/null
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "filebeat";
+  version = "8.16.1";
+
+  src = fetchFromGitHub {
+    owner = "elastic";
+    repo = "beats";
+    tag = "v${version}";
+    hash = "sha256-suzubh5aILiuRe8/wb52fnSujGNhGRXBxE8jv1WDzNc=";
+  };
+
+  vendorHash = "sha256-wspQImG/cxWglwojweuH+h5abTSrtcK6F8cpBeCDH/U=";
+
+  subPackages = [ "filebeat" ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  versionCheckProgramArg = [ "version" ];
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Tails and ships log files";
+    homepage = "https://github.com/elastic/beats";
+    changelog = "https://www.elastic.co/guide/en/beats/libbeat/${version}/release-notes-${version}.html";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ srhb ];
+    mainProgram = "filebeat";
+  };
+}