diff --git a/.gitignore b/.gitignore
index 1f62938..b6ade6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /yash-*.tar.xz
+/yash-*.tar.gz
diff --git a/sources b/sources
index 5e85d13..f07dc6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (yash-2.54.tar.xz) = 360dc55782def4ce8c1a5cf12836ec86405dfbe338c6a623c8031e84f76da1bfa2e5a5ad05c1a62ea7b516681457d124398e2194e2d23824c19216eb3807e155
+SHA512 (yash-2.61.tar.gz) = 80362496a11b79dad0de13b75a9083397d684758cdf744622b94f34f7dd6e0db685c8786f74efb52dddcf9ad6d7ad50017b7940fb10f368a4c7f433ff5182d39
diff --git a/yash.spec b/yash.spec
index 98f2787..605496b 100644
--- a/yash.spec
+++ b/yash.spec
@@ -2,29 +2,26 @@
 # Upstream is currently using SVN
 # SVN path: http://svn.sourceforge.jp/svnroot/yash/yash/trunk
 
-%global		repoid		78345
-%global		mainver	2.54
+%global		mainver		2.61
 %global		docver		%{mainver}
 
-%if 0%{?fedora} >= 20
 %global		yashdocdir		%{_datadir}/doc/%{name}-doc
-%else
-%global		yashdocdir		%{_datadir}/doc/%{name}-doc-%{version}
-%endif
 
-%global		mainrel		1
+%global		baserelease	2
 %undefine		minorver
 %undefine       _changelog_trimtime
 
 Name:		yash
 Version:	%{mainver}
-Release:	%{?minorver:0.}%{mainrel}%{?minorver:.%{minorver}}%{?dist}
+Release:	%{?minorver:0.}%{baserelease}%{?minorver:.%{minorver}}%{?dist}
 Summary:	Yet Another SHell
 
-License:	GPLv2+
-URL:		http://yash.osdn.net/
-Source0:	http://osdn.dl.osdn.net/yash/%{repoid}/%{name}-%{version}%{?minorver}.tar.xz
-#Source1:	http://dl.osdn.jp/yash/%{repoid}/%{name}-doc-%{docver}%{?minorver}-ja.tar.gz
+# License header in .c files are GPL-2.0-or-later
+# However, doc/intro.txt says this is under GPL-2.0-only
+# SPDX confirmed
+License:	GPL-2.0-only
+URL:		https://github.com/magicant/yash/
+Source0:	https://github.com/magicant/yash/archive/%{version}/%{name}-%{version}%{?minorver}.tar.gz
 
 # Patches
 
@@ -32,6 +29,10 @@ BuildRequires:	make
 BuildRequires:	gcc
 BuildRequires:	ncurses-devel
 BuildRequires:	ed
+BuildRequires:	/usr/bin/a2x
+BuildRequires:	/usr/bin/asciidoc
+BuildRequires:	/usr/bin/xgettext
+BuildRequires:	/usr/bin/ps
 Provides:		/bin/yash
 # Write needed Requires for scriptlets explicitly
 Requires(post):	grep
@@ -54,7 +55,7 @@ Yash also has its own features beyond POSIX, such as:
 %package	doc
 Summary:	Documentation for %{name}
 Version:	%{docver}
-License:	CC-BY-SA
+License:	CC-BY-SA-2.1-JP
 BuildArch:	noarch
 Requires:	%{name} = %{mainver}-%{release}
 #Requires:	%{name} >= %{version}
@@ -68,18 +69,14 @@ This package contains document files for %{name}.
 %build
 # This package use configure not based on autotools...
 # won't accept --libdir=
-env \
-	CC="%{__cc}" \
-	CFLAGS="%{optflags}" \
-	\
-	./configure \
+./configure \
 	--prefix=%{_prefix} \
 	--exec-prefix=%{_exec_prefix} \
 	--bindir=%{_bindir} \
 	--datarootdir=%{_datarootdir} \
 	--docdir=%{yashdocdir}/ \
 
-make -k %{?_smp_mflags}
+%make_build -k
 
 %install
 make install install-html \
@@ -114,12 +111,11 @@ sed -i -e '\@/bin/yash$@d' %{_sysconfdir}/shells
 exit 0
 
 %files -f %name.lang
-%defattr(-,root,root,-)
 %license	COPYING
 %doc	NEWS
-%doc	README
+%doc	README.md
 %lang(ja)	%doc	NEWS.ja
-%lang(ja)	%doc	README.ja
+%lang(ja)	%doc	README.ja.md
 
 %{_bindir}/%{name}
 
@@ -132,13 +128,57 @@ exit 0
 %lang(ja)	%{_mandir}/ja/man1/yash.1*
 
 %files	doc
-%defattr(-,root,root,-)
 %dir	%{yashdocdir}/
 %{yashdocdir}/*.html
 %{yashdocdir}/*.css
 %lang(ja)	%{yashdocdir}/ja/
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.61-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Thu Mar 05 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.61-1
+- 2.61
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.60-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Sep 17 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.60-1
+- 2.60
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.59-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu May 15 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.59-1
+- 2.59
+
+* Tue Feb 04 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.58.1-1
+- 2.58.1
+
+* Mon Feb 03 2025 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.58-2
+- 2.58
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.57-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Aug 06 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.57-1
+- 2.57
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.56.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Mar 21 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.56.1-1
+- 2.56.1
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.55-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Aug 21 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.55-1
+- 2.55
+
+* Sat Jul 22 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.54-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Mon Feb 27 2023 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.54-1
 - 2.54