diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch b/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch
deleted file mode 100644
index 78dfcfe06458..000000000000
--- a/pkgs/by-name/ay/ayatana-indicator-messages/fix-pie.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 316457cf70dd105905d5d4925f43de280f08ab10 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Sat, 11 Jan 2025 20:55:29 +0100
-Subject: [PATCH] tests/CMakeLists.txt: Drop hardcoded -no-pie linker flags
-
----
- tests/CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 63beacb..5b0812c 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -32,7 +32,6 @@ add_dependencies("indicator-messages-service" "ayatana-indicator-messages-servic
- # test-gactionmuxer
- 
- add_executable("test-gactionmuxer" test-gactionmuxer.cpp)
--target_link_options("test-gactionmuxer" PRIVATE -no-pie)
- target_include_directories("test-gactionmuxer" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/src")
- target_link_libraries("test-gactionmuxer" "indicator-messages-service" ${PROJECT_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES})
- add_test("test-gactionmuxer" "test-gactionmuxer")
-@@ -59,7 +58,6 @@ add_custom_target("gschemas-compiled" ALL DEPENDS gschemas.compiled)
- 
- pkg_check_modules(DBUSTEST REQUIRED dbustest-1)
- add_executable("indicator-test" indicator-test.cpp)
--target_link_options("indicator-test" PRIVATE -no-pie)
- target_include_directories("indicator-test" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS} ${DBUSTEST_INCLUDE_DIRS} "${CMAKE_SOURCE_DIR}/libmessaging-menu")
- target_link_libraries("indicator-test" "messaging-menu" ${PROJECT_DEPS_LIBRARIES} ${DBUSTEST_LIBRARIES} ${GTEST_LIBRARIES} ${GTEST_BOTH_LIBRARIES} ${GMOCK_LIBRARIES})
- target_compile_definitions(
diff --git a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
index d217e3c199bd..0ee00b0b3236 100644
--- a/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-messages/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ayatana-indicator-messages";
-  version = "24.5.0";
+  version = "24.5.1";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = "ayatana-indicator-messages";
     tag = finalAttrs.version;
-    hash = "sha256-D1181eD2mAVXEa7RLXXC4b2tVGrxbh0WWgtbC1anHH0=";
+    hash = "sha256-M6IXI0ZnWPZod2ewxxfCeHhdYUrWDW/BFc1vMHmjObA=";
   };
 
   outputs = [
@@ -40,16 +40,11 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ] ++ lib.optionals withDocumentation [ "devdoc" ];
 
-  patches = [
-    # Remove when https://github.com/AyatanaIndicators/ayatana-indicator-messages/pull/39 merged & in release
-    ./fix-pie.patch
-  ];
-
   postPatch =
     ''
       # Uses pkg_get_variable, cannot substitute prefix with that
       substituteInPlace data/CMakeLists.txt \
-        --replace-fail "\''${SYSTEMD_USER_DIR}" "$out/lib/systemd/user"
+        --replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
 
       # Bad concatenation
       substituteInPlace libmessaging-menu/messaging-menu.pc.in \
@@ -61,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
         --replace-fail 'GI_TYPELIB_PATH=\"' 'GI_TYPELIB_PATH=\"$GI_TYPELIB_PATH$\{GI_TYPELIB_PATH\:+\:\}'
     ''
     + lib.optionalString (!withDocumentation) ''
-      sed -i CMakeLists.txt \
-        '/add_subdirectory(doc)/d'
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'add_subdirectory(doc)' '# add_subdirectory(doc)'
     '';
 
   strictDeps = true;
@@ -105,9 +100,9 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DENABLE_TESTS=${lib.boolToString finalAttrs.finalPackage.doCheck}"
-    "-DGSETTINGS_LOCALINSTALL=ON"
-    "-DGSETTINGS_COMPILE=ON"
+    (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
+    (lib.cmakeBool "GSETTINGS_COMPILE" true)
   ];
 
   makeFlags = lib.optionals withDocumentation [
@@ -163,6 +158,9 @@ stdenv.mkDerivation (finalAttrs: {
       others, e.g. XFCE, LXDE).
     '';
     homepage = "https://github.com/AyatanaIndicators/ayatana-indicator-messages";
+    changelog = "https://github.com/AyatanaIndicators/ayatana-indicator-messages/blob/${
+      if (!builtins.isNull finalAttrs.src.tag) then finalAttrs.src.tag else finalAttrs.src.rev
+    }/ChangeLog";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ OPNA2608 ];