diff --git a/hunspell-et.spec b/hunspell-et.spec
index 417b4cc..23b6700 100644
--- a/hunspell-et.spec
+++ b/hunspell-et.spec
@@ -1,14 +1,20 @@
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
 Name: hunspell-et
 Summary: Estonian hunspell dictionaries
 %global upstreamid 20030606
 Version: 0.%{upstreamid}
-Release: 27%{?dist}
+Release: 28%{?dist}
 Source: http://www.meso.ee/~jjpp/speller/ispell-et_%{upstreamid}.tar.gz
 URL: http://www.meso.ee/~jjpp/speller/
 License: LGPLv2+ and LPPL
 BuildArch: noarch
 
-Requires: hunspell
+Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-et)
 Provides: hunspell-ee = 0.20030606-4
 Obsoletes: hunspell-ee < 0.20030606-4
@@ -30,15 +36,15 @@ Estonian hyphenation rules.
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p latin-1/et_EE.* $RPM_BUILD_ROOT/%{_datadir}/myspell
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p latin-1/et_EE.* $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
 cp -p hyph_et.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_et_EE.dic
 
 
 %files
 %doc README COPYRIGHT ChangeLog
-%{_datadir}/myspell/*
+%{_datadir}/%{dict_dirname}/*
 
 %files -n hyphen-et
 %doc README COPYRIGHT ChangeLog
@@ -46,6 +52,10 @@ cp -p hyph_et.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen/hyph_et_EE.dic
 
 
 %changelog
+* Tue Mar 22 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.20030606-28
+- Add conditional for new hunspell dir path and update to Requires:
+  hunspell-filesystem
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20030606-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild