diff --git a/main/dovecot/APKBUILD b/main/dovecot/APKBUILD
index bb862d492e6fe022e37ea5910653c835b1874326..57adfdf239126a60df44925b27396be220a86dce 100644
--- a/main/dovecot/APKBUILD
+++ b/main/dovecot/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=dovecot
 pkgver=2.2.33.2
 _pkgvermajor=2.2
-pkgrel=3
+pkgrel=4
 _pigeonholever=0.4.21
 _pluginextdataver=39
 _pigeonholevermajor=${_pigeonholever%.*}
@@ -29,6 +29,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-pigeonhole-plugin-extdata:_sieve
 source="http://www.dovecot.org/releases/$_pkgvermajor/$pkgname-$pkgver.tar.gz
 	http://pigeonhole.dovecot.org/releases/$_pkgvermajor/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholever.tar.gz
 	http://hg.rename-it.nl/pigeonhole-${_pigeonholevermajor}-sieve-extdata/archive/$_pluginextdataver.tar.gz
+	skip-iconv-check.patch
 	dovecot.logrotate
 	dovecot.initd
 	extdata.conf
@@ -85,6 +86,12 @@ build() {
 	make
 }
 
+check() {
+	cd "$builddir"
+	make check
+}
+
+
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
@@ -221,6 +228,7 @@ _fts_lucene() {
 sha512sums="028910a4d02b1630f1ada4d1c45fcc3ea2057969db7078a78d46e2a578b4dceaf8be0ac8de4a613b4890019e721871f2d366ec651db658da4cc72977d3e09931  dovecot-2.2.33.2.tar.gz
 4751f449ede1b05173c706b414ebf9f7f670ff78589ce6f0b687c32c9abe6dae8b3064ed1b20e893d9ec0147b0139ce479e1d74ebe94747c33f2d8ca177912de  dovecot-2.2-pigeonhole-0.4.21.tar.gz
 832a80264fb9bd3021c4e192eb7594c203100783df547aff35acf4dc4d8de5eddfd676fcc5a07a0691d9bb6eb884c9497a692b72a2af5bf9e9bb7a2d3f38923e  39.tar.gz
+09bae967d35b9e5d7d91c81337e1bf5e5aba3abb7b0ab06427f1a0d6f9bb5b2f2e39306cfe45d80488110fc0414e3e2515c0265286c1584d80f8af366d1568a9  skip-iconv-check.patch
 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0  dovecot.logrotate
 d2758a22e5b3d1d1be867fd237466a1b5fe7ecd4355fdc51fa9e5ceab48a862f8a5d83992d2ae17a3e0b2c611ff92d0de833d7e1c5f00c6f4bfb94403dbda8e4  dovecot.initd
 7aa66cbd2a520d863fc8ff2ec48520c6fe4629ec345545b362e16c3072843f5315c6e12513ed86200d66b7c55e17f5bb21c7a12d86721968a9e03cc595dc5bcd  extdata.conf"
diff --git a/main/dovecot/skip-iconv-check.patch b/main/dovecot/skip-iconv-check.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0b8ad39bdc1ba4697859a2d0a9e1adaa58b04650
--- /dev/null
+++ b/main/dovecot/skip-iconv-check.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib-charset/test-charset.c b/src/lib-charset/test-charset.c
+index 68632e1..36fd092 100644
+--- a/src/lib-charset/test-charset.c
++++ b/src/lib-charset/test-charset.c
+@@ -159,7 +159,7 @@ int main(void)
+ 	static void (*test_functions[])(void) = {
+ 		test_charset_is_utf8,
+ 		test_charset_utf8,
+-#ifdef HAVE_ICONV
++#if 0 //def HAVE_ICONV
+ 		test_charset_iconv,
+ 		test_charset_iconv_crashes,
+ 		test_charset_iconv_utf7_state,