diff --git a/packages/hunspell-ru/build.sh b/packages/hunspell-ru/build.sh
index 1705a6efc7..d192cf02f2 100644
--- a/packages/hunspell-ru/build.sh
+++ b/packages/hunspell-ru/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://hunspell.github.io
 TERMUX_PKG_DESCRIPTION="Russian dictionary for hunspell"
 TERMUX_PKG_LICENSE="LGPL-3.0"
-TERMUX_PKG_VERSION=20170303
+TERMUX_PKG_VERSION=20200604
 TERMUX_PKG_SKIP_SRC_EXTRACT=true
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
 
@@ -13,9 +13,9 @@ termux_step_make_install() {
 	# In which case we need to bump version and checksum used.
 	termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/ru_RU/ru_RU.aff \
 			$TERMUX_PREFIX/share/hunspell/ru_RU.aff \
-			709cf9b41208961226e995a3ab75a2da834aaf4f9707cb87cbb37d4943b6a50d
+			38ce7d4af78e211e9bafe4bf7e3d6a2c420591136cb738ec6648f8fdf6524cd7
 	termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/ru_RU/ru_RU.dic \
 			$TERMUX_PREFIX/share/hunspell/ru_RU.dic \
-			c0d81126b0a905ccc6fd891c923b43d39b4ce449da5a333859229354c510168f
+			3280afe7829128ff589b2c5d8f46810ed9b0eddcc85e9b1cc3d12dc08d4c1a0b
 	touch $TERMUX_PREFIX/share/hunspell/ru_RU.{aff,dic}
 }
diff --git a/packages/hunspell/build.sh b/packages/hunspell/build.sh
index d192cf02f2..523b895438 100644
--- a/packages/hunspell/build.sh
+++ b/packages/hunspell/build.sh
@@ -1,21 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://hunspell.github.io
-TERMUX_PKG_DESCRIPTION="Russian dictionary for hunspell"
-TERMUX_PKG_LICENSE="LGPL-3.0"
-TERMUX_PKG_VERSION=20200604
-TERMUX_PKG_SKIP_SRC_EXTRACT=true
-TERMUX_PKG_PLATFORM_INDEPENDENT=true
+TERMUX_PKG_DESCRIPTION="Spell checker"
+TERMUX_PKG_LICENSE="GPL-2.0"
+TERMUX_PKG_VERSION=1.7.0
+TERMUX_PKG_REVISION=5
+TERMUX_PKG_SRCURL=https://github.com/hunspell/hunspell/archive/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=bb27b86eb910a8285407cf3ca33b62643a02798cf2eef468c0a74f6c3ee6bc8a
+TERMUX_PKG_DEPENDS="libc++, libiconv, ncurses, readline, hunspell-en-us"
+TERMUX_PKG_BREAKS="hunspell-dev"
+TERMUX_PKG_REPLACES="hunspell-dev"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ui --with-readline"
+TERMUX_PKG_BUILD_IN_SRC=true
 
-termux_step_make_install() {
-	mkdir -p $TERMUX_PREFIX/share/hunspell/
-	# On checksum mismatch the files may have been updated:
-	#  https://cgit.freedesktop.org/libreoffice/dictionaries/log/ru_RU/ru_RU.aff
-	#  https://cgit.freedesktop.org/libreoffice/dictionaries/log/ru_RU/ru_RU.dic
-	# In which case we need to bump version and checksum used.
-	termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/ru_RU/ru_RU.aff \
-			$TERMUX_PREFIX/share/hunspell/ru_RU.aff \
-			38ce7d4af78e211e9bafe4bf7e3d6a2c420591136cb738ec6648f8fdf6524cd7
-	termux_download https://cgit.freedesktop.org/libreoffice/dictionaries/plain/ru_RU/ru_RU.dic \
-			$TERMUX_PREFIX/share/hunspell/ru_RU.dic \
-			3280afe7829128ff589b2c5d8f46810ed9b0eddcc85e9b1cc3d12dc08d4c1a0b
-	touch $TERMUX_PREFIX/share/hunspell/ru_RU.{aff,dic}
+termux_step_pre_configure() {
+	autoreconf -vfi
 }