diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/.gitignore b/.gitignore
index 63f502d..be468d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,5 @@ corosync-1.2.7.tar.gz
 /corosync-3.1.6.tar.gz
 /corosync-3.1.7.tar.gz
 /corosync-3.1.8.tar.gz
+/corosync-3.1.9.tar.gz
+/corosync-3.1.10.tar.gz
diff --git a/corosync.spec b/corosync.spec
index 614a28d..6e04bf1 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -12,16 +12,13 @@
 %bcond_without runautogen
 %bcond_without userflags
 
-%global gitver %{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}
-%global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}}
-
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
-Version: 3.1.8
-Release: 1%{?gitver}%{?dist}
+Version: 3.1.10
+Release: 1%{?dist}
 License: BSD-3-Clause
 URL: http://corosync.github.io/corosync/
-Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz
+Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 
 # Runtime bits
 # The automatic dependency overridden in favor of explicit version lock
@@ -68,9 +65,10 @@ Requires: libxslt
 BuildRequires: readline-devel
 %endif
 BuildRequires: make
+BuildRequires: git
 
 %prep
-%setup -q -n %{name}-%{version}%{?gittarver}
+%autosetup -S git_am
 
 %build
 %if %{with runautogen}
@@ -116,7 +114,7 @@ BuildRequires: make
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
-install -m 644 %{_builddir}/%{name}-%{version}%{?gittarver}/conf/corosync-signals.conf %{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf %{buildroot}/%{_datadir}/dbus-1/system.d/corosync-signals.conf
 %endif
 
 ## tree fixup
@@ -185,7 +183,7 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/corosync
 %config(noreplace) %{_sysconfdir}/logrotate.d/corosync
 %if %{with dbus}
-%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
+%{_datadir}/dbus-1/system.d/corosync-signals.conf
 %endif
 %if %{with snmp}
 %{_datadir}/snmp/mibs/COROSYNC-MIB.txt
@@ -197,8 +195,10 @@ fi
 %{_initrddir}/corosync
 %{_initrddir}/corosync-notifyd
 %endif
+%if %{without systemd}
 %dir %{_localstatedir}/lib/corosync
 %dir %{_localstatedir}/log/cluster
+%endif
 %{_mandir}/man7/corosync_overview.7*
 %{_mandir}/man8/corosync.8*
 %{_mandir}/man8/corosync-blackbox.8*
@@ -289,6 +289,35 @@ network splits)
 %endif
 
 %changelog
+* Sat Nov 15 2025 Jan Friesse <jfriesse@redhat.com> - 3.1.10-1
+- New upstream release
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Mon Jun 16 2025 Jan Friesse <jfriesse@redhat.com> - 3.1.9-4
+- exec: Add support for env STATE_DIRECTORY
+- init: Use LogsDirectory in systemd unit file
+
+* Wed Mar 26 2025 Jan Friesse <jfriesse@redhat.com> - 3.1.9-3
+- totemsrp: Check size of orf_token msg
+  (fixes CVE-2025-30472)
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Nov 15 2024 Jan Friesse <jfriesse@redhat.com> - 3.1.9-1
+- New upstream release
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Nov 15 2023 Jan Friesse <jfriesse@redhat.com> - 3.1.8-1
 - New upstream release
 
diff --git a/sources b/sources
index fd916ac..9c626fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (corosync-3.1.8.tar.gz) = 6325ae39bada33dbc0c85eb07d137af78235a1c0f8a4d1f90a20088e011bff65263903e5688956256ddfb58daec45f6d96c04624ff320be0c00ec36aa5d568f8
+SHA512 (corosync-3.1.10.tar.gz) = cf2014d15fdbd3495cfe64629255f7855a79651a595938dac7bc7ec67338d843079ae40cf1c15de23b50d85cb39b2c2e3e3448a9cc33759ad8988b8c85ce59d3
diff --git a/tests/.gitignore b/tests/.gitignore
deleted file mode 100644
index e6c79fd..0000000
--- a/tests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Ignore tests runs/artefacts.
-artifacts/**
-**/*.retry
diff --git a/tests/plan.fmf b/tests/plan.fmf
new file mode 100644
index 0000000..1c97683
--- /dev/null
+++ b/tests/plan.fmf
@@ -0,0 +1,12 @@
+summary: Run all smoke tests
+discover:
+    how: fmf
+execute:
+    how: tmt
+prepare:
+    how: install
+    package:
+        - gcc
+        - iproute
+        - corosync
+        - corosync-devel
diff --git a/tests/smoke/main.fmf b/tests/smoke/main.fmf
new file mode 100644
index 0000000..c431594
--- /dev/null
+++ b/tests/smoke/main.fmf
@@ -0,0 +1,2 @@
+summary: Basic smoke test
+test: ./runtest.sh
diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh
old mode 100644
new mode 100755
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 39b6209..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    tests:
-    - smoke
-    required_packages:
-    - gcc
-    - iproute
-    - corosync
-    - corosync-devel