diff --git a/pkgs/by-name/fe/feedbackd/package.nix b/pkgs/by-name/fe/feedbackd/package.nix
index 4c69db645be7..c7f33858bd52 100644
--- a/pkgs/by-name/fe/feedbackd/package.nix
+++ b/pkgs/by-name/fe/feedbackd/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  testers,
   docbook-xsl-nons,
   docutils,
   gi-docgen,
@@ -27,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "feedbackd";
-  version = "0.8.5";
+  version = "0.8.9";
 
   outputs = [
     "out"
@@ -37,12 +38,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
-    owner = "agx";
+    owner = "feedbackd";
     repo = "feedbackd";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-m8jDn7gDrZOsdFl17IsIINgcpuHmmtNOCEEdQFwVj6g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4cbH5jzbLROs/FtbiktlyZPGPYiIo3wgqgOCzyzNzzs=";
   };
 
+  postPatch = ''
+    patchShebangs run.in
+
+    substituteInPlace data/72-feedbackd.rules \
+      --replace-fail '/usr/libexec/' "$out/libexec/"
+  '';
+
   depsBuildBuild = [
     pkg-config
   ];
@@ -73,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
   mesonFlags = [
     "-Dgtk_doc=true"
     "-Dman=true"
+    "-Dmedia-roles=true"
     # Make compiling work when doCheck = false
     "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
   ];
@@ -84,11 +93,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  postInstall = ''
-    mkdir -p $out/lib/udev/rules.d
-    sed "s|/usr/libexec/|$out/libexec/|" < $src/data/90-feedbackd.rules > $out/lib/udev/rules.d/90-feedbackd.rules
-  '';
-
   postFixup = ''
     # Move developer documentation to devdoc output.
     # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
@@ -103,6 +107,10 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      versionCheck = true;
+    };
     updateScript = nix-update-script { };
   };
 
@@ -110,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Theme based Haptic, Visual and Audio Feedback";
-    homepage = "https://gitlab.freedesktop.org/agx/feedbackd/";
+    homepage = "https://gitlab.freedesktop.org/feedbackd/feedbackd/";
     license = with lib.licenses; [
       # feedbackd
       gpl3Plus
@@ -122,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
       pacman99
       Luflosi
     ];
+    pkgConfigModules = [ "libfeedback-0.0" ];
     platforms = lib.platforms.linux;
   };
 })