diff --git a/gnome-commander.spec b/gnome-commander.spec
index 807f632..19979f7 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -10,10 +10,10 @@
 
 %global        if_pre                0
 
-%global        use_gcc_strict_sanitize        1
+%global        use_gcc_strict_sanitize        0
 
-%global        use_release           0
-%global        use_gitbare           1
+%global        use_release           1
+%global        use_gitbare           0
 
 %if 0%{?use_gitbare} < 1
 # force
@@ -26,10 +26,10 @@
 %endif
 
 %if 0%{?use_gitbare}
-%global        gittardate            20240722
-%global        gittartime            1701
-%global        gitbaredate           20240721
-%global        git_rev               e241767a2011d15b3f0129f23233fee074540a86
+%global        gittardate            20240721
+%global        gittartime            1636
+%global        gitbaredate           20240719
+%global        git_rev               95c732e0bda821f4b1eb437d2bc175acd268c9c6
 %global        git_short             %(echo %{git_rev} | cut -c-8)
 %global        git_version           %{gitbaredate}git%{git_short}
 
@@ -38,7 +38,7 @@
 %endif
 
 %global        shortver              1.18
-%global        fullver               %{shortver}.0
+%global        fullver               %{shortver}.4
 
 %if 0%{?use_release} >= 1
 %global        fedoraver             %{fullver}
@@ -110,6 +110,10 @@ BuildRequires: pkgconfig(gtest)
 
 Requires:         meld
 Requires:         gnome-icon-theme-legacy
+%if 0%{?fedora} >= 41
+BuildRequires: gdk-pixbuf2-modules-extra
+Requires:      gdk-pixbuf2-modules-extra%{?_isa}
+%endif
 
 %description
 GNOME Commander is a nice and fast file manager for the GNOME desktop. 
@@ -195,7 +199,7 @@ sed -i meson.build \
 	-e 's|^\(samba = dependency\)|# \1|' \
 	-e 's|^\(have_samba = .*\)$|have_samba = true|' \
 	%{nil}
-git commit -m "Tweak samba detection" -a || true
+git commit -m "Tweak samba detection" -a
 
 # Don't install unneeded files
 sed -i doc/meson.build \
@@ -289,6 +293,7 @@ popd
 
 %{_datadir}/glib-2.0/schemas/org.gnome.*xml
 %dir %{_datadir}/%{name}
+#%%{_datadir}/%{name}/*.txt
 %{_datadir}/%{name}/icons/
 
 %{_datadir}/applications/org.gnome.%{name}.desktop
@@ -301,6 +306,31 @@ popd
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Thu Oct 02 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.4-1
+- 1.18.4
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4:1.18.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jun 26 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.3-1
+- 1.18.3
+
+* Mon Feb 10 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.2-1
+- 1.18.2
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4:1.18.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Sun Sep 15 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.1-2
+- Require gdk-pixbuf2-modules-extra when available
+
+* Thu Aug 01 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.1-1
+- 1.18.1
+
+* Tue Jul 23 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.0-2
+- Apply upstream PR for workaround for segfault with leaving tab pointing to
+  invalid directory
+
 * Mon Jul 22 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.18.0-1
 - 0.18.0
 
diff --git a/sources b/sources
index 076d176..d5cd8e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-commander-20240722T1701.tar.gz) = 0e6788b155d0bee511dec46d1f1059d9197bd7f78b23296d392f94579737a89c4444c5ebf25462f0129c6965926c595639d1e0fb48bba9dd6f15bf0183ffa498
+SHA512 (gnome-commander-1.18.4.tar.xz) = 54966719e63a4ca6c9d24cbd1f69dbadd4ac0b7588c2cd1a34635deafcab5976d9e82fdcf6dbc0dc7f1098a25443c9eeaa2400db192b487b6d92d62f62ee23db