diff --git a/hunspell-hi.spec b/hunspell-hi.spec
index dd71d5a..4bd2d6a 100644
--- a/hunspell-hi.spec
+++ b/hunspell-hi.spec
@@ -1,14 +1,20 @@
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
 Name: hunspell-hi
 Summary: Hindi hunspell dictionaries
 Version: 1.0.0
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch:   1
 Source:  http://anishpatil.fedorapeople.org/hi_in.%{version}.tar.gz
 URL: https://gitorious.org/hunspell_dictionaries/hunspell_dictionaries.git
 License: GPLv2+
 BuildArch: noarch
 
-Requires: hunspell
+Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-hi)
 
 %description
@@ -22,15 +28,19 @@ mv hi_IN/Copyright.utf8 hi_IN/Copyright
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p hi_IN/*.dic hi_IN/*.aff $RPM_BUILD_ROOT/%{_datadir}/myspell
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p hi_IN/*.dic hi_IN/*.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
 
 %files
 %doc hi_IN/README
 %license hi_IN/COPYING hi_IN/Copyright
-%{_datadir}/myspell/*
+%{_datadir}/%{dict_dirname}/*
 
 %changelog
+* 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