diff --git a/.gitignore b/.gitignore
index 7b0caca..56f5d11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 aspell6-fa-0.11-0.tar.bz2
+/hunspell-fa-0.11.tar.bz2
diff --git a/generate-source.sh b/generate-source.sh
new file mode 100644
index 0000000..98bc173
--- /dev/null
+++ b/generate-source.sh
@@ -0,0 +1,23 @@
+# This script generate Farsi wordlist for hunspell
+# This requires aspell wordlist tarball and aspell installed on your system
+# Aspell is depreacted in Fedora due to https://fedoraproject.org/wiki/Changes/AspellDeprecation
+
+wget ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-0.11-0.tar.bz2
+tar -jxvf aspell6-fa-0.11-0.tar.bz2
+cd aspell6-fa-0.11-0
+export LANG=C.UTF-8
+preunzip -d *.cwl
+cat *.wl > farsi.wordlist
+wordlist2hunspell farsi.wordlist fa_IR
+cp -p fa.dat fa_IR.aff
+cd ..
+mkdir hunspell-fa-0.11
+cd hunspell-fa-0.11
+cp -p ../aspell6-fa-0.11-0/COPYING ../aspell6-fa-0.11-0/Copyright ../aspell6-fa-0.11-0/README  ../aspell6-fa-0.11-0/doc/ChangeLog .
+cp -p ../aspell6-fa-0.11-0/fa_IR.* .
+cat > README.fedora << EOF
+This source tarball has been created using aspell6-fa-0.11-0 tarball and wordlist2hunspell script.
+EOF
+cd ..
+tar -cf hunspell-fa-0.11.tar hunspell-fa-0.11
+bzip2 hunspell-fa-0.11.tar
diff --git a/hunspell-fa.spec b/hunspell-fa.spec
index 8bb3258..8abec87 100644
--- a/hunspell-fa.spec
+++ b/hunspell-fa.spec
@@ -9,11 +9,11 @@ Summary: Farsi hunspell dictionaries
 %global upstreamid 20070116
 Version: 0.%{upstreamid}
 Release: 31%{?dist}
-Source: ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-0.11-0.tar.bz2
-URL: http://aspell.net/
+# This source is generated by generate-source.sh using aspell dictionary
+Source: hunspell-fa-0.11.tar.bz2
+URL: http://ftp.gnu.org/gnu/aspell/dict/fa
 License: GPL-2.0-or-later
 BuildArch: noarch
-BuildRequires: aspell, hunspell-devel
 
 Requires: hunspell-filesystem
 Supplements: (hunspell and langpacks-fa)
@@ -22,24 +22,24 @@ Supplements: (hunspell and langpacks-fa)
 Farsi hunspell dictionaries.
 
 %prep
-%setup -q -n aspell6-fa-0.11-0
+%setup -q -n hunspell-fa-0.11
 
 %build
-export LANG=C.UTF-8
-preunzip -d *.cwl
-cat *.wl > farsi.wordlist
-wordlist2hunspell farsi.wordlist fa_IR
+# nothing to build here
 
 %install
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
 cp -p *.dic *.aff $RPM_BUILD_ROOT/%{_datadir}/%{dict_dirname}
 
-
 %files
-%doc COPYING Copyright doc/README doc/ChangeLog
+%doc COPYING Copyright README ChangeLog
 %{_datadir}/%{dict_dirname}/*
 
 %changelog
+* Tue Aug 08 2023 Parag Nemade <pnemade AT redhat DOT com> - 0.20070116-32
+- Use new source archive generated using Farsi aspell dictionary
+- Resolves:rhbz#2218158 - Drop dependency on aspell
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.20070116-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index c8c3339..66ea6dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-47c8599e529fc291a096c12f0b8372ca  aspell6-fa-0.11-0.tar.bz2
+SHA512 (hunspell-fa-0.11.tar.bz2) = c566a808f8c6e91e674ae32a70ac9b22e4571037e3e24957ef71237aa4fdbb0520f0315932ec104c805a15d2e674cd52c848a61f19d09a24aac51472edf2d48a