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/hunspell-bn.spec b/hunspell-bn.spec
index ff43317..517b8fe 100644
--- a/hunspell-bn.spec
+++ b/hunspell-bn.spec
@@ -1,14 +1,20 @@
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
 Name: hunspell-bn
 Summary: Bengali hunspell dictionaries
 Version: 1.0.0
-Release: 15%{?dist}
+Release: 28%{?dist}
 Epoch: 1
 Source: http://anishpatil.fedorapeople.org/bn_in.%{version}.tar.gz
 URL: https://gitorious.org/hunspell_dictionaries/hunspell_dictionaries.git
-License: GPLv2+
+License: GPL-2.0-or-later
 BuildArch: noarch
 
-Requires: hunspell
+Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-bn)
 
 %description
@@ -22,16 +28,63 @@ chmod 644 bn_IN/*
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p bn_IN/*.dic bn_IN/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p bn_IN/*.dic bn_IN/*.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+pushd $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+bn_IN_aliases="bn_BD"
+for lang in ${bn_IN_aliases}; do
+    ln -s bn_IN.aff $lang.aff
+    ln -s bn_IN.dic $lang.dic
+done
+popd
 
 
 %files
 %doc bn_IN/README
 %license bn_IN/COPYING bn_IN/Copyright
-%{_datadir}/myspell/*
+%{_datadir}/%{dict_dirname}/*
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Nov 23 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:1.0.0-21
+- Update license tag to SPDX format
+
+* Mon Sep 05 2022 Mike FABIAN <mfabian@redhat.com> - 1:1.0.0-20
+- Add symlinks from bn_IN.{dic,aff} -> bn_BD.{dic,aff}
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Mar 22 2022 Parag Nemade <pnemade AT redhat DOT com> - 1:1.0.0-18
+- Add conditional for new hunspell dir path and update to Requires:
+  hunspell-filesystem
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.0.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/plans/hunspell-bn.fmf b/plans/hunspell-bn.fmf
new file mode 100644
index 0000000..c1627f9
--- /dev/null
+++ b/plans/hunspell-bn.fmf
@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt
diff --git a/tests/scripts/run_tests.sh b/tests/scripts/run_tests.sh
deleted file mode 100644
index 80d965a..0000000
--- a/tests/scripts/run_tests.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-python3 test_suggest_words.py
-python3 test_dic_availability.py
diff --git a/tests/test_dic_availability.fmf b/tests/test_dic_availability.fmf
new file mode 100644
index 0000000..2c87123
--- /dev/null
+++ b/tests/test_dic_availability.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-bn
+test: python3 test_dic_availability.py
+framework: shell
+
diff --git a/tests/scripts/test_dic_availability.py b/tests/test_dic_availability.py
similarity index 100%
rename from tests/scripts/test_dic_availability.py
rename to tests/test_dic_availability.py
diff --git a/tests/test_suggest_words.fmf b/tests/test_suggest_words.fmf
new file mode 100644
index 0000000..f79fcb7
--- /dev/null
+++ b/tests/test_suggest_words.fmf
@@ -0,0 +1,6 @@
+require:
+- python3-enchant
+- hunspell-bn
+test: python3 test_suggest_words.py
+framework: shell
+
diff --git a/tests/scripts/test_suggest_words.py b/tests/test_suggest_words.py
similarity index 100%
rename from tests/scripts/test_suggest_words.py
rename to tests/test_suggest_words.py
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index 5ffb74a..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      required_packages:
-      - python3-enchant
-      tags:
-        - classic
-      tests:
-        - sample:
-            dir: scripts/
-            run: ./run_tests.sh