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 0c329f8..3076a6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /gfs2-utils-3.4.1.tar.gz
 /gfs2-utils-3.5.0.tar.gz
 /gfs2-utils-3.5.1.tar.gz
+/gfs2-utils-3.6.1.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 778e1d5..3f1220a 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
-Version: 3.5.1
-Release: 7%{?dist}
+Version: 3.6.1
+Release: 2%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -55,7 +55,6 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_sbindir}/gfs2_grow
 %{_sbindir}/gfs2_jadd
 %{_sbindir}/mkfs.gfs2
-%{_sbindir}/gfs2_convert
 %{_sbindir}/gfs2_edit
 %{_sbindir}/tunegfs2
 %{_sbindir}/glocktop
@@ -66,6 +65,12 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Feb 27 2025 Andrew Price <anprice@redhat.com> - 3.6.1-1
+- New upstream release
+
 * Mon Jan 20 2025 Andrew Price <anprice@redhat.com> - 3.5.1-7
 - Don't hardcode /usr/sbin in the spec
 
diff --git a/plans/testsuite.fmf b/plans/testsuite.fmf
new file mode 100644
index 0000000..2f86880
--- /dev/null
+++ b/plans/testsuite.fmf
@@ -0,0 +1,5 @@
+summary: Run testsuite
+discover:
+  how: fmf
+execute:
+  how: tmt
diff --git a/sources b/sources
index 4278534..bf0a0ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.5.1.tar.gz) = 08c7b1870b1fb76496f7ab4ce3c121e4e5f5a37760831536817ed880ef030d765a533c53ba9913ae080b4a98b4efaffa112fcf92acd4e939199d1dae8d0e6f9b
+SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index aaaac51..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      environment:
-        PATH: ".:{{ ansible_env.PATH }}"
-      tests:
-        - upstream_test_suite:
-            dir: .
-            run: ./testsuite
diff --git a/tests/testsuite.fmf b/tests/testsuite.fmf
new file mode 100644
index 0000000..dd9714f
--- /dev/null
+++ b/tests/testsuite.fmf
@@ -0,0 +1,2 @@
+summary: Upstream testsuite
+test: ./testsuite