diff --git a/hunspell-tpi.spec b/hunspell-tpi.spec
index 2fdf75d..38ec6d1 100644
--- a/hunspell-tpi.spec
+++ b/hunspell-tpi.spec
@@ -1,12 +1,18 @@
+%if 0%{?fedora} >= 36 || 0%{?rhel} > 9
+%global dict_dirname hunspell
+%else
+%global dict_dirname myspell
+%endif
+
 Name: hunspell-tpi
 Summary: Tok Pisin hunspell dictionaries
 Version: 0.07
-Release: 18%{?dist}
+Release: 19%{?dist}
 Source: https://downloads.sourceforge.net/project/aoo-extensions/4824/3/hunspell-tpi-0.07.oxt
 URL: http://extensions.services.openoffice.org/en/project/tok-pisin-spell-checker
 License: GPLv3+
 BuildArch: noarch
-Requires: hunspell
+Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-tpi)
 
 %description
@@ -18,16 +24,20 @@ Tok Pisin hunspell dictionaries.
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/myspell
-cp -p dictionaries/tpi_PG.* $RPM_BUILD_ROOT/%{_datadir}/myspell
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
+cp -p dictionaries/tpi_PG.* $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
 
 
 %files
 %doc dictionaries/README_tpi_PG.txt
 %license LICENSES-en.txt
-%{_datadir}/myspell/*
+%{_datadir}/%{dict_dirname}/*
 
 %changelog
+* Tue Mar 22 2022 Parag Nemade <pnemade AT redhat DOT com> - 0.07-19
+- Add conditional for new hunspell dir path and update to Requires:
+  hunspell-filesystem
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.07-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild