diff --git a/srcpkgs/hunspell/hunspell-devel.template b/srcpkgs/hunspell/hunspell-devel.template
index 48b05bbc0de..423d9cc8d96 100644
--- a/srcpkgs/hunspell/hunspell-devel.template
+++ b/srcpkgs/hunspell/hunspell-devel.template
@@ -5,6 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
+revision=1
+
+Add_dependency run libstdc++-devel
+Add_dependency run ncursesw-devel
 Add_dependency run hunspelll
 
 do_install()
diff --git a/srcpkgs/hunspell/template b/srcpkgs/hunspell/template
index 37798bea824..7b855e3bd5a 100644
--- a/srcpkgs/hunspell/template
+++ b/srcpkgs/hunspell/template
@@ -1,6 +1,7 @@
 # Template file for 'hunspell'
 pkgname=hunspell
 version=1.2.8
+revision=1
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 configure_args="--with-ui"
@@ -20,9 +21,12 @@ long_desc="
   * Hunspell is based on MySpell and works also with MySpell dictionaries.
   * GPL/LGPL/MPL tri-license."
 
-# XXX Add ncursesw dependency
 subpackages="$pkgname-devel" 
+Add_dependency run libgcc
+Add_dependency run glibc
+Add_dependency run libstdc++
+Add_dependency run ncursesw
 Add_dependency build pkg-config
 Add_dependency build bison
-Add_dependency full glibc
-Add_dependency full ncurses
+Add_dependency build libstdc++-devel
+Add_dependency build ncursesw-devel
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index f3b33bca1f4..0e182db9898 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -453,3 +453,4 @@ libicudata.so.42		icu-libs		icu-devel
 libicutu.so.42			icu-libs		icu-devel
 libicuuc.so.42			icu-libs		icu-devel
 libaspell.so.15			aspell			aspell-devel
+libhunspell-1.2.so		hunspell		hunspell-devel