diff --git a/backport-ghc-pkg-wrapper-fix.patch b/backport-ghc-pkg-wrapper-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d85574bd50373a63cdb54754ae1e6c8aa3912d8b
--- /dev/null
+++ b/backport-ghc-pkg-wrapper-fix.patch
@@ -0,0 +1,25 @@
+diff --color -Naur origin/ghc-rpm-macros-2.6.4/ghc-pkg-wrapper ghc-rpm-macros-2.6.4/ghc-pkg-wrapper
+--- origin/ghc-rpm-macros-2.6.4/ghc-pkg-wrapper	2025-03-27 03:06:24.499652053 +0800
++++ ghc-rpm-macros-2.6.4/ghc-pkg-wrapper	2025-03-27 13:18:36.330343142 +0800
+@@ -7,6 +7,10 @@
+ PKGBASEDIR=$1
+ shift
+ 
++ARCH=$(uname -m)
++GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
++PKGLIBDIR=${PKGBASEDIR}/lib/${ARCH}-linux-ghc-${GHC_VER}/
++
+ if [ -d $PKGBASEDIR/lib ];
+ then PKGCONFDIR=$PKGBASEDIR/lib/package.conf.d
+ else PKGCONFDIR=$PKGBASEDIR/package.conf.d
+@@ -14,9 +18,8 @@
+ 
+ # for a ghc build use the new ghc-pkg
+ if [ -x "$PKGBASEDIR/bin/ghc-pkg" ]; then
+-    GHC_PKG="ghc-pkg --global-package-db=$PKGCONFDIR"
++    GHC_PKG="env LD_LIBRARY_PATH=$PKGLIBDIR $PKGBASEDIR/bin/ghc-pkg --global-package-db=$PKGCONFDIR"
+ else
+-    GHC_VER=$(basename $PKGBASEDIR | sed -e s/ghc-//)
+     GHC_PKG="/usr/bin/ghc-pkg-${GHC_VER} -f $PKGCONFDIR"
+ fi
+ 
diff --git a/ghc-rpm-macros-2.5.2.tar.xz b/ghc-rpm-macros-2.5.2.tar.xz
deleted file mode 100644
index 4b2a7603a2dd451c3afe907f9c34a6a5d36c9438..0000000000000000000000000000000000000000
Binary files a/ghc-rpm-macros-2.5.2.tar.xz and /dev/null differ
diff --git a/ghc-rpm-macros-2.6.4.tar.xz b/ghc-rpm-macros-2.6.4.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..49986a44dddfdbd56ebbda2e9581e74713dc7bc1
Binary files /dev/null and b/ghc-rpm-macros-2.6.4.tar.xz differ
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index c05088ca7f3dc322ea058cd0568412bc9f47f101..959097baa65bea7780eb4fc787564f93f3083362 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           ghc-rpm-macros
-Version:        2.5.2
-Release:        4
+Version:        2.6.4
+Release:        2
 Summary:        RPM Macros for building packages for GHC
 License:        GPL-3.0-or-later
 URL:            https://src.fedoraproject.org/rpms/ghc-rpm-macros
@@ -10,6 +10,8 @@ Patch1:         using-help-as-doc-packages-suffix.patch
 Patch2:         remove-leading-and-trailing-space.patch
 # Use debug_package instead of _enable_debug_packages to disable debuginfo.
 Patch3:         disable-debuginfo.patch
+# Backport ghc-rpm-macros 2.7.4's fix for ghc-pkg-wrapper
+Patch4:         backport-ghc-pkg-wrapper-fix.patch
 BuildRequires:  xz
 Requires:       rpm
 Requires:       chrpath
@@ -37,6 +39,7 @@ install -p -D -m 0644 macros.ghc %{buildroot}%{_rpmmacrodir}/macros.ghc
 install -p -D -m 0644 macros.ghc-extra %{buildroot}/%{_rpmmacrodir}/macros.ghc-extra
 install -p -D -m 0644 macros.ghc-suse %{buildroot}/%{_rpmmacrodir}/macros.ghc-suse
 install -p -D -m 0755 ghc-deps.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh
+install -p -D -m 0755 ghc-info.sh %{buildroot}/%{_prefix}/lib/rpm/ghc-info.sh
 install -p -D -m 0755 cabal-tweak-dep-ver %{buildroot}/%{_bindir}/cabal-tweak-dep-ver
 install -p -D -m 0755 cabal-tweak-drop-dep %{buildroot}/%{_bindir}/cabal-tweak-drop-dep
 install -p -D -m 0755 cabal-tweak-flag %{buildroot}/%{_bindir}/cabal-tweak-flag
@@ -51,6 +54,7 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
 %{_rpmmacrodir}/macros.ghc
 %{_rpmmacrodir}/macros.ghc-suse
 %{_prefix}/lib/rpm/ghc-deps.sh
+%{_prefix}/lib/rpm/ghc-info.sh
 %{_bindir}/cabal-tweak-dep-ver
 %{_bindir}/cabal-tweak-flag
 %{_bindir}/cabal-tweak-drop-dep
@@ -64,6 +68,9 @@ install -p -D -m 0644 Setup.hs %{buildroot}/%{_datadir}/%{name}/Setup.hs
 %{_rpmmacrodir}/macros.ghc-extra
 
 %changelog
+* Tue May 27 2025 Lin Runze <lrzlin@163.com> 2.6.4-2
+- Update to version 2.6.4 for ghc 9.10.1
+
 * Fri Feb 28 2025 Lin Runze <lrzlin@163.com> 2.5.2-4
 - Remove leading and trailing spaces in CFLAGS and LDFLAGS to avoid linking failure.
 
diff --git a/remove-leading-and-trailing-space.patch b/remove-leading-and-trailing-space.patch
index 050631e5483200a8882dcbd009119e50a9244435..38469761949d16d08c9b468d07ab70ff1d8dab0c 100644
--- a/remove-leading-and-trailing-space.patch
+++ b/remove-leading-and-trailing-space.patch
@@ -1,12 +1,12 @@
-diff --color -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.ghc
---- origin/ghc-rpm-macros-2.5.2/macros.ghc	2025-02-28 18:55:10.289782645 +0800
-+++ ghc-rpm-macros-2.5.2/macros.ghc	2025-02-28 18:55:58.619767541 +0800
-@@ -98,7 +98,7 @@
- subsubdir=/lib\
+diff --color -Naur origin/ghc-rpm-macros-2.6.4/macros.ghc ghc-rpm-macros-2.6.4/macros.ghc
+--- origin/ghc-rpm-macros-2.6.4/macros.ghc	2025-05-27 02:10:21.414882706 +0800
++++ ghc-rpm-macros-2.6.4/macros.ghc	2025-05-27 02:15:27.034826229 +0800
+@@ -97,7 +97,7 @@
  fi\
  %cabal --version\
--%cabal configure %{!-W:%{?ghc_name:--with-compiler=%{_bindir}/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?cabal_configure_options} $cabal_configure_extra_options
-+%cabal configure %{!-W:%{?ghc_name:--with-compiler=%{_bindir}/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$(echo $CFLAGS | awk '{$1=$1};1') | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$(echo $LDFLAGS | awk '{$1=$1};1') | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?cabal_configure_options} $cabal_configure_extra_options
- 
+ # bindir hardcoded for flatpaks\
+-%cabal configure %{!-W:%{?ghc_name:--with-compiler=/usr/bin/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?flatpak:--extra-lib-dirs=%{_libdir}} %{?cabal_configure_options} $cabal_configure_extra_options
++%cabal configure %{!-W:%{?ghc_name:--with-compiler=/usr/bin/ghc-%{ghc_version}}} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler'${subsubdir}/'$pkgid' --datasubdir='$pkgid' --libexecsubdir='$pkgid' --ghc --dynlibdir=%{?_ghcdynlibdir}%{?!_ghcdynlibdir:%{_libdir}/ghc-%{ghc_version}${subsubdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --ghc-options="${CFLAGS:+$(echo ' '$(echo $CFLAGS | awk '{$1=$1};1') | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$(echo $LDFLAGS | awk '{$1=$1};1') | sed -e 's/ / -optl/g')} -fhide-source-paths" %{?flatpak:--extra-lib-dirs=%{_libdir}} %{?cabal_configure_options} $cabal_configure_extra_options
+
  # install
  %cabal_install %cabal copy --destdir=%{buildroot} %{?cabal_install_options}
diff --git a/using-help-as-doc-packages-suffix.patch b/using-help-as-doc-packages-suffix.patch
index b995f9bce56e63dd12e72e35bea8265a78ce7044..937218c9a5facbba8cc3081794d4353b2c12b386 100644
--- a/using-help-as-doc-packages-suffix.patch
+++ b/using-help-as-doc-packages-suffix.patch
@@ -1,7 +1,7 @@
-diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.ghc
---- origin/ghc-rpm-macros-2.5.2/macros.ghc	2023-03-19 08:16:20.000000000 +0800
-+++ ghc-rpm-macros-2.5.2/macros.ghc	2023-09-26 16:30:17.418978816 +0800
-@@ -161,8 +161,8 @@
+diff --color -Naur origin/ghc-rpm-macros-2.6.4/macros.ghc ghc-rpm-macros-2.6.4/macros.ghc
+--- origin/ghc-rpm-macros-2.6.4/macros.ghc	2023-11-12 02:28:35.114813076 +0800
++++ ghc-rpm-macros-2.6.4/macros.ghc	2024-07-28 03:37:59.842776679 +0800
+@@ -159,8 +159,8 @@
  exit 1\
  fi\
  %define basepkg %{ghc_prefix}-%{pkgname}\
@@ -12,7 +12,7 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.gh
  %if 0%{?1:1}\
  if [ -d "%{buildroot}%{_ghclicensedir}/%{basepkg}" ]; then\
  for i in $(ls %{buildroot}%{_ghclicensedir}/%{basepkg}); do\
-@@ -194,18 +194,18 @@
+@@ -192,18 +192,18 @@
  %if %{with haddock}\
  haddock_dir=%{ghc_html_libraries_dir}/%{pkgnamever}\
  if [ -d %{buildroot}$haddock_dir ]; then\
@@ -34,7 +34,7 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.gh
  if [ -f "$i" ]; then\
  sed -i -e "s!%{buildroot}!!g" $i\
  fi\
-@@ -217,7 +217,7 @@
+@@ -215,7 +215,7 @@
  cat %{name}-%1.files >> %{name}-%2.files\
  cat %{name}-%1-devel.files >> %{name}-%2-devel.files\
  %if %{with haddock}\
@@ -43,9 +43,9 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc ghc-rpm-macros-2.5.2/macros.gh
  %endif\
  %if %{with ghc_prof}\
  cat %{name}-%1-prof.files >> %{name}-%2-prof.files\
-diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc-extra ghc-rpm-macros-2.5.2/macros.ghc-extra
---- origin/ghc-rpm-macros-2.5.2/macros.ghc-extra	2023-02-02 23:29:52.000000000 +0800
-+++ ghc-rpm-macros-2.5.2/macros.ghc-extra	2023-09-26 10:29:01.799794938 +0800
+diff --color -Naur origin/ghc-rpm-macros-2.6.4/macros.ghc-extra ghc-rpm-macros-2.6.4/macros.ghc-extra
+--- origin/ghc-rpm-macros-2.6.4/macros.ghc-extra	2023-11-11 05:31:02.756300258 +0800
++++ ghc-rpm-macros-2.6.4/macros.ghc-extra	2024-07-28 03:38:41.772766644 +0800
 @@ -48,16 +48,16 @@
  \
  %if 0%{!-m:1}\
@@ -67,7 +67,7 @@ diff -Naur origin/ghc-rpm-macros-2.5.2/macros.ghc-extra ghc-rpm-macros-2.5.2/mac
  This package provides the Haskell %{pkgname} library documentation.\
  %endif\
  \
-@@ -81,7 +81,7 @@
+@@ -84,7 +84,7 @@
  %if 0%{!-m:1}\
  \
  %if %{with haddock}\