diff --git a/srcpkgs/gmime/files/iconv-detect.h b/srcpkgs/gmime/files/iconv-detect.h
new file mode 100644
index 0000000000..714cb5aa9d
--- /dev/null
+++ b/srcpkgs/gmime/files/iconv-detect.h
@@ -0,0 +1,5 @@
+/* This is an auto-generated header, DO NOT EDIT! */
+
+#define ICONV_ISO_INT_FORMAT "iso-%u-%u"
+#define ICONV_ISO_STR_FORMAT "iso-%u-%s"
+#define ICONV_10646 "iso-10646"
diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 26f4fdbb59..7185cd5d97 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -1,9 +1,9 @@
 # Template file for 'gmime'
 pkgname=gmime
 version=2.6.19
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-mono --enable-smime"
+configure_args="--disable-static --disable-mono --enable-smime --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config intltool"
 makedepends="glib-devel gpgme-devel"
 short_desc="GNOME Core mime parsing library"
@@ -13,8 +13,20 @@ homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/gmime/2.6/gmime-${version}.tar.xz"
 checksum=affb402b991519f83fb9c88464a9c07891860df18246c0743689c027d773a14a
 
+case "$XBPS_TARGET_MACHINE" in
+	# glibc
+	i686|x86_64|armv?l)
+		configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
+		configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
+		configure_args+=" am_cv_proto_iconv_arg1="
+		pre_build() {
+			cp ${FILESDIR}/*.h ${wrksrc}
+		}
+		;;
+esac
+
 gmime-devel_package() {
-	depends="libglib-devel zlib-devel gmime-${version}_${revision}"
+	depends="libglib-devel zlib-devel gmime>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include