diff --git a/gpicview.spec b/gpicview.spec
index 623d4ac..718e075 100644
--- a/gpicview.spec
+++ b/gpicview.spec
@@ -11,36 +11,37 @@
 %global		git_builddir	%{nil}
 
 %if 0%{?use_gitbare}
-%global		gittardate		20230915
-%global		gittartime		1104
+%global		gittardate		20250329
+%global		gittartime		1449
+%define		use_gitcommit_as_rel		0
 
-%global		gitbaredate	20230913
-%global		git_rev		3438fc58e65d90761009d5c108584d0730653741
+%global		gitbaredate	20250327
+%global		git_rev		ca13623c6176585db4759ce4371fbf89c56fa630
 %global		git_short		%(echo %{git_rev} | cut -c-8)
 %global		git_version	%{gitbaredate}git%{git_short}
 %endif
 
-%if 0%{?use_git} || 0%{?use_gitbare}
+%if 0%{?use_gitcommit_as_rel}
 %global		git_ver_rpm	^%{git_version}
 %global		git_builddir	-%{git_version}
 %endif
 
 
-%global		main_version	0.2.5
+%global		main_version	0.3.1
 
 Name:			gpicview
 Version:		%{main_version}%{git_ver_rpm}
-Release:		1%{?dist}
+Release:		2%{?dist}
 Summary:		Simple and fast Image Viewer for X
 
 # SPDX confirmed
 License:		GPL-2.0-or-later
-URL:			http://lxde.sourceforge.net/gpicview/
+URL:			https://github.com/lxde/%{name}/
 %if 0%{?use_gitbare}
 Source0:		%{name}-%{gittardate}T%{gittartime}.tar.gz
 %endif
 %if 0%{?use_release}
-Source0:		http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.xz
+Source0:		https://github.com/lxde/%{name}/archive/%{main_version}/%{name}-%{version}.tar.gz
 %endif
 Source101:		create-gpicview-git-bare-tarball.sh
 
@@ -52,10 +53,8 @@ BuildRequires:	pkgconfig(gtk+-3.0)
 BuildRequires:	libjpeg-devel
 BuildRequires:	desktop-file-utils
 
-%if 0%{?use_gitbare}
 BuildRequires:	automake
 BuildRequires:	libtool
-%endif
 BuildRequires:	git
 
 Requires:		/usr/bin/xdg-mime
@@ -80,6 +79,17 @@ git clone ./%{name}.git/
 cd %{name}
 
 git checkout -b %{main_version}-fedora %{git_rev}
+
+# Restore timestamps
+set +x
+echo "Restore timestamps"
+git ls-tree -r --name-only HEAD | while read f
+do
+	unixtime=$(git log -n 1 --pretty='%ct' -- $f)
+	touch -d "@${unixtime}" $f
+done
+set -x
+
 cp -a [A-Z]* ..
 %endif
 
@@ -95,9 +105,9 @@ git commit -m "base" -q
 %build
 %if 0%{?use_gitbare}
 cd %{name}
-bash autogen.sh
 %endif
 
+bash autogen.sh
 %configure \
 	--enable-gtk3 \
 	--disable-silent-rules \
@@ -134,8 +144,42 @@ cd ..
 %{_datadir}/gpicview/pixmaps/
 %{_datadir}/gpicview/ui/
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sat Mar 29 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.3.1-1
+- 0.3.1
+
+* Wed Feb 12 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.6^20241011git4dbf5125-1
+- Update to the latest git
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6^20240818.1git1efbde2a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Oct 08 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.6^20240818.1git1efbde2a-1
+- Update to the latest git
+
+* Sun Aug 25 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.6^20240818gitcfce58f1-1
+- Update to the latest git
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jul 17 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.6-1
+- 0.2.6
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.5^20231013git95eef260-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.5^20231013git95eef260-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Dec 31 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.5^20231013git95eef260-1
+- Update to the latest git
+
 * Fri Sep 15 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.2.5^20230913git3438fc58-1
 - Update to the latest git
 
diff --git a/sources b/sources
index eb8869c..9adf3fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gpicview-20230915T1104.tar.gz) = 1d89e979d41128d3356d593214cc8814c407804fb7c34fad483f8e1ab9ee8623cf754dd4839a3ea53a1a56c962d973675e0fae7824949f8f97974dbd66940c70
+SHA512 (gpicview-20250329T1449.tar.gz) = 132431b189f25bbfa8f7fae30caf263ca2adc0a0959b6ccf0e36e2bec58987585946ffd667c758eefd111315c0b59dd822f630d935a67811105cc4b71b3f9b3b