diff --git a/hunspell-mi.spec b/hunspell-mi.spec
index f5a6a4d..d90c88e 100644
--- a/hunspell-mi.spec
+++ b/hunspell-mi.spec
@@ -1,14 +1,20 @@
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
 Name: hunspell-mi
 Summary: Maori hunspell dictionaries
 %global upstreamid 20080630
 Version: 0.%{upstreamid}
-Release: 24%{?dist}
+Release: 25%{?dist}
 Source: http://download.services.openoffice.org/contrib/dictionaries/mi_NZ.zip
 URL: https://wiki.openoffice.org/wiki/Dictionaries
 License: GPLv3+
 BuildArch: noarch
 
-Requires: hunspell
+Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-mi)
 
 %description
@@ -25,17 +31,21 @@ for i in README_mi_NZ.txt; do
 done
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p mi_NZ.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/mi_NZ.aff
-cp -p mi_NZ.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/mi_NZ.dic
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p mi_NZ.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/mi_NZ.aff
+cp -p mi_NZ.dic $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/mi_NZ.dic
 
 
 %files
 %doc README_mi_NZ.txt
 %license LICENSE_mi_NZ.txt
-%{_datadir}/myspell/*
+%{_datadir}/%{dict_dirname}/*
 
 %changelog
+* Tue Mar 22 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.20080630-25
+- Add conditional for new hunspell dir path and update to Requires:
+  hunspell-filesystem
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20080630-24
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild