diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index a369e39..3e07824 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,8 +7,8 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.6.1
-Release:        2%{?dist}
+Version:        2.6.3
+Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPL-3.0-or-later
@@ -185,7 +185,7 @@ mkdir -p %{buildroot}%{_docdir}/ghc/html/libraries
 
 
 %changelog
-* Mon Oct 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.1-2
+* Mon Oct 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2.6.3-1
 - Fix flatpak builds
 
 * Tue Oct 24 2023 Jens Petersen <petersen@redhat.com> - 2.6.1-1
diff --git a/macros.ghc b/macros.ghc
index 58ff4f1..a43c4e4 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -95,12 +95,14 @@ export LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"\
 %cabal_configure\
 %ghc_set_gcc_flags\
 if ! [ -f Setup.hs -o -f Setup.lhs ]; then\
+# datadir hardcoded for flatpaks
 cp /usr/share/ghc-rpm-macros/Setup.hs .\
 fi\
 if [ -d "%{ghclibdir}/lib" ]; then\
 subsubdir=/lib\
 fi\
 %cabal --version\
+# 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
 
 # install
@@ -302,6 +304,7 @@ done\
 done\
 %endif
 
+# bindir hardcoded for flatpaks
 %ghc_pkg_recache /usr/bin/ghc-pkg-%{ghc_version} recache --no-user-package-db || :
 
 # skip prof libs and documentation