diff --git a/hunspell-ar.spec b/hunspell-ar.spec
index 8ba3e23..c41f2a7 100644
--- a/hunspell-ar.spec
+++ b/hunspell-ar.spec
@@ -1,15 +1,21 @@
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
 %global ver_date 2014-11-08
 
 Summary: Arabic hunspell dictionaries
 Name: hunspell-ar
 Version: 3.5
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2 or LGPLv2 or MPLv1.1
 URL: http://ayaspell.sourceforge.net/
 Source: http://sourceforge.net/projects/ayaspell/files/hunspell-ar_%{version}.%{ver_date}.zip
 
 BuildArch: noarch
-Requires: hunspell
+Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-ar)
 
 %description
@@ -22,11 +28,11 @@ Arabic (Egypt, Algeria, etc.) hunspell dictionaries.
 chmod -x *
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p ar.dic $RPM_BUILD_ROOT/%{_datadir}/myspell/ar_TN.dic
-cp -p ar.aff $RPM_BUILD_ROOT/%{_datadir}/myspell/ar_TN.aff
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p ar.dic $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/ar_TN.dic
+cp -p ar.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/ar_TN.aff
 
-pushd $RPM_BUILD_ROOT/%{_datadir}/myspell/
+pushd $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}/
 ar_TN_aliases="ar_AE ar_BH ar_DJ ar_DZ ar_EG ar_ER ar_IL ar_IN ar_IQ ar_JO ar_KM ar_KW ar_LB ar_LY ar_MA ar_MR ar_OM ar_PS ar_QA ar_SA ar_SD ar_SO ar_SY ar_TD ar_YE"
 for lang in $ar_TN_aliases; do
     ln -s ar_TN.aff $lang.aff
@@ -36,9 +42,13 @@ popd
 
 %files
 %doc AUTHORS ChangeLog-ar COPYING README-* THANKS
-%{_datadir}/myspell/*
+%{_datadir}/%{dict_dirname}/*
 
 %changelog
+* Tue Mar 22 2022 Parag Nemade <pnemade AT redhat DOT com> - 3.5-16
+- Add conditional for new hunspell dir path and update to Requires:
+  hunspell-filesystem
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild