diff --git a/libiconv/android-aarch64/PKGBUILD b/libiconv/android-aarch64/PKGBUILD
index 7a711225..6ccc8212 100644
--- a/libiconv/android-aarch64/PKGBUILD
+++ b/libiconv/android-aarch64/PKGBUILD
@@ -5,24 +5,16 @@
 _pkgname=libiconv
 _pkg_arch=aarch64
 _android_arch=arm64-v8a
-_android_toolchain=$_pkg_arch-linux-android
 _android_platform=22
-_android_platform_arch=arch-arm64
-_prefix=/opt/android-libs/$_pkg_arch
-_android_ndk_path=/opt/android-ndk
-_android_gcc_toolchain_path=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64
-_android_gcc_tool_prefix=${_android_gcc_toolchain_path}/bin/${_android_toolchain}
-_android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/bin
-_android_sysroot=${_android_ndk_path}/platforms/android-$_android_platform/${_android_platform_arch}
 
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides libiconv.so and libcharset.so (Android $_pkg_arch)"
 arch=('any')
 url='http://www.gnu.org/software/libiconv/'
 license=('LGPL')
-makedepends=('android-ndk')
+makedepends=('android-ndk' 'android-configure')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("http://ftp.gnu.org/pub/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
@@ -31,59 +23,18 @@ options=(!libtool !buildflags staticlibs !strip !emptydirs)
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver}
-  sed '/LD_RUN_PATH/d' -i Makefile.in
+  source android-env ${_pkg_arch}
 
-  # configure tools
-  export CPP=${PWD}/cpp.sh
-  export AR=${_android_gcc_tool_prefix}-ar
-  export AS=${_android_gcc_tool_prefix}-as
-  export NM=${_android_gcc_tool_prefix}-nm
-  export CC=${_android_clang_toolchain_path}/clang
-  export CXX=${_android_clang_toolchain_path}/clang++
-  export LD=${_android_gcc_tool_prefix}-ld
-  export RANLIB=${_android_gcc_tool_prefix}-ranlib
-  export STRIP=${_android_gcc_tool_prefix}-strip
-
-  # configure flags
-  export CFLAGS="${CFLAGS} --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} -I${_android_ndk_path}/sysroot/usr/include -I${_android_ndk_path}/sysroot/usr/include/${_android_toolchain} -I${_android_sysroot}/usr/include -I${_android_gcc_toolchain_path}/include -fexceptions -frtti"
-  export CPPFLAGS="${CFLAGS}"
-  export LDFLAGS="${LDFLAGS} -L${_android_sysroot}/usr/lib"
-
-  # setup preprocessor (because the NDK doesn't provide a wrapper like for gcc and g++)
-  printf "#!/bin/bash\nexec \"$CXX\" --target=${_android_toolchain} -E \"\$@\"" > "$CPP"
-  chmod +x "$CPP"
-
-  ./configure \
-    --host=$_android_toolchain \
-    --target=$_android_toolchain \
-    --build="$CHOST" \
-    --with-sysroot="${_android_sysroot}" \
-    --prefix="$_prefix" \
-    --libdir="$_prefix/lib" \
-    --includedir="$_prefix/include" \
-    --enable-shared=yes \
-    --enable-static=yes
-
-  # make sure the LDFLAGS are actually used (LDFLAGS are not passed otherwise)
-  local libtool_subst="s:\\\$CC -shared:\\\$CC -shared --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} $LDFLAGS:g"
-  sed -i "$libtool_subst" libtool
-  sed -i "$libtool_subst" libcharset/libtool
-
-  # build target lib/localcharset.h and directory lib to experience less brokenness
-  make lib/localcharset.h
-  cd lib
-  make
+  android-${_pkg_arch}-configure
+  make $MAKEFLAGS
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver}/lib
-  make DESTDIR="$pkgdir" LIBDIR="$_prefix/lib" install
-  cp libcharset.a "$pkgdir/$_prefix/lib/libcharset.a"
-  cp libcharset.so "$pkgdir/$_prefix/lib/libcharset.so"
-  cd ..
-  mkdir -p "$pkgdir/$_prefix"/include
-  mv include/iconv.h "$pkgdir/$_prefix"/include
-  cd libcharset
-  mv include/libcharset.h "$pkgdir/$_prefix"/include
-  mv include/localcharset.h "$pkgdir/$_prefix"/include
+  cd $srcdir/${_pkgname}-${pkgver}
+  source android-env ${_pkg_arch}
+
+  make DESTDIR="$pkgdir" install
+  rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+  ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+  ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }
diff --git a/libiconv/android-armv7a-eabi/PKGBUILD b/libiconv/android-armv7a-eabi/PKGBUILD
index 2afd90b1..c3a67ac1 100644
--- a/libiconv/android-armv7a-eabi/PKGBUILD
+++ b/libiconv/android-armv7a-eabi/PKGBUILD
@@ -5,24 +5,16 @@
 _pkgname=libiconv
 _pkg_arch=armv7a-eabi
 _android_arch=armeabi-v7a
-_android_toolchain=arm-linux-androideabi
 _android_platform=21
-_android_platform_arch=arch-arm
-_prefix=/opt/android-libs/$_pkg_arch
-_android_ndk_path=/opt/android-ndk
-_android_gcc_toolchain_path=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64
-_android_gcc_tool_prefix=${_android_gcc_toolchain_path}/bin/${_android_toolchain}
-_android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/bin
-_android_sysroot=${_android_ndk_path}/platforms/android-$_android_platform/${_android_platform_arch}
 
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides libiconv.so and libcharset.so (Android $_pkg_arch)"
 arch=('any')
 url='http://www.gnu.org/software/libiconv/'
 license=('LGPL')
-makedepends=('android-ndk')
+makedepends=('android-ndk' 'android-configure')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("http://ftp.gnu.org/pub/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
@@ -31,59 +23,18 @@ options=(!libtool !buildflags staticlibs !strip !emptydirs)
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver}
-  sed '/LD_RUN_PATH/d' -i Makefile.in
+  source android-env ${_pkg_arch}
 
-  # configure tools
-  export CPP=${PWD}/cpp.sh
-  export AR=${_android_gcc_tool_prefix}-ar
-  export AS=${_android_gcc_tool_prefix}-as
-  export NM=${_android_gcc_tool_prefix}-nm
-  export CC=${_android_clang_toolchain_path}/clang
-  export CXX=${_android_clang_toolchain_path}/clang++
-  export LD=${_android_gcc_tool_prefix}-ld
-  export RANLIB=${_android_gcc_tool_prefix}-ranlib
-  export STRIP=${_android_gcc_tool_prefix}-strip
-
-  # configure flags
-  export CFLAGS="${CFLAGS} --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} -I${_android_ndk_path}/sysroot/usr/include -I${_android_ndk_path}/sysroot/usr/include/${_android_toolchain} -I${_android_sysroot}/usr/include -I${_android_gcc_toolchain_path}/include -fexceptions -frtti"
-  export CPPFLAGS="${CFLAGS}"
-  export LDFLAGS="${LDFLAGS} -L${_android_sysroot}/usr/lib"
-
-  # setup preprocessor (because the NDK doesn't provide a wrapper like for gcc and g++)
-  printf "#!/bin/bash\nexec \"$CXX\" --target=${_android_toolchain} -E \"\$@\"" > "$CPP"
-  chmod +x "$CPP"
-
-  ./configure \
-    --host=$_android_toolchain \
-    --target=$_android_toolchain \
-    --build="$CHOST" \
-    --with-sysroot="${_android_sysroot}" \
-    --prefix="$_prefix" \
-    --libdir="$_prefix/lib" \
-    --includedir="$_prefix/include" \
-    --enable-shared=yes \
-    --enable-static=yes
-
-  # make sure the LDFLAGS are actually used (LDFLAGS are not passed otherwise)
-  local libtool_subst="s:\\\$CC -shared:\\\$CC -shared --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} $LDFLAGS:g"
-  sed -i "$libtool_subst" libtool
-  sed -i "$libtool_subst" libcharset/libtool
-
-  # build target lib/localcharset.h and directory lib to experience less brokenness
-  make lib/localcharset.h
-  cd lib
-  make
+  android-${_pkg_arch}-configure
+  make $MAKEFLAGS
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver}/lib
-  make DESTDIR="$pkgdir" LIBDIR="$_prefix/lib" install
-  cp libcharset.a "$pkgdir/$_prefix/lib/libcharset.a"
-  cp libcharset.so "$pkgdir/$_prefix/lib/libcharset.so"
-  cd ..
-  mkdir -p "$pkgdir/$_prefix"/include
-  mv include/iconv.h "$pkgdir/$_prefix"/include
-  cd libcharset
-  mv include/libcharset.h "$pkgdir/$_prefix"/include
-  mv include/localcharset.h "$pkgdir/$_prefix"/include
+  cd $srcdir/${_pkgname}-${pkgver}
+  source android-env ${_pkg_arch}
+
+  make DESTDIR="$pkgdir" install
+  rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+  ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+  ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }
diff --git a/libiconv/android-x86-64/PKGBUILD b/libiconv/android-x86-64/PKGBUILD
index 5040cf41..e95bd3f6 100644
--- a/libiconv/android-x86-64/PKGBUILD
+++ b/libiconv/android-x86-64/PKGBUILD
@@ -5,24 +5,16 @@
 _pkgname=libiconv
 _pkg_arch=x86-64
 _android_arch=x86_64
-_android_toolchain=$_pkg_arch-linux-android
 _android_platform=22
-_android_platform_arch=arch-x86_64
-_prefix=/opt/android-libs/$_pkg_arch
-_android_ndk_path=/opt/android-ndk
-_android_gcc_toolchain_path=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64
-_android_gcc_tool_prefix=${_android_gcc_toolchain_path}/bin/${_android_toolchain}
-_android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/bin
-_android_sysroot=${_android_ndk_path}/platforms/android-$_android_platform/${_android_platform_arch}
 
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides libiconv.so and libcharset.so (Android $_pkg_arch)"
 arch=('any')
 url='http://www.gnu.org/software/libiconv/'
 license=('LGPL')
-makedepends=('android-ndk')
+makedepends=('android-ndk' 'android-configure')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("http://ftp.gnu.org/pub/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
@@ -31,59 +23,18 @@ options=(!libtool !buildflags staticlibs !strip !emptydirs)
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver}
-  sed '/LD_RUN_PATH/d' -i Makefile.in
+  source android-env ${_pkg_arch}
 
-  # configure tools
-  export CPP=${PWD}/cpp.sh
-  export AR=${_android_gcc_tool_prefix}-ar
-  export AS=${_android_gcc_tool_prefix}-as
-  export NM=${_android_gcc_tool_prefix}-nm
-  export CC=${_android_clang_toolchain_path}/clang
-  export CXX=${_android_clang_toolchain_path}/clang++
-  export LD=${_android_gcc_tool_prefix}-ld
-  export RANLIB=${_android_gcc_tool_prefix}-ranlib
-  export STRIP=${_android_gcc_tool_prefix}-strip
-
-  # configure flags
-  export CFLAGS="${CFLAGS} --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} -I${_android_ndk_path}/sysroot/usr/include -I${_android_ndk_path}/sysroot/usr/include/${_android_toolchain} -I${_android_sysroot}/usr/include -I${_android_gcc_toolchain_path}/include -fexceptions -frtti"
-  export CPPFLAGS="${CFLAGS}"
-  export LDFLAGS="${LDFLAGS} -L${_android_sysroot}/usr/lib"
-
-  # setup preprocessor (because the NDK doesn't provide a wrapper like for gcc and g++)
-  printf "#!/bin/bash\nexec \"$CXX\" --target=${_android_toolchain} -E \"\$@\"" > "$CPP"
-  chmod +x "$CPP"
-
-  ./configure \
-    --host=$_android_toolchain \
-    --target=$_android_toolchain \
-    --build="$CHOST" \
-    --with-sysroot="${_android_sysroot}" \
-    --prefix="$_prefix" \
-    --libdir="$_prefix/lib" \
-    --includedir="$_prefix/include" \
-    --enable-shared=yes \
-    --enable-static=yes
-
-  # make sure the LDFLAGS are actually used (LDFLAGS are not passed otherwise)
-  local libtool_subst="s:\\\$CC -shared:\\\$CC -shared --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} $LDFLAGS:g"
-  sed -i "$libtool_subst" libtool
-  sed -i "$libtool_subst" libcharset/libtool
-
-  # build target lib/localcharset.h and directory lib to experience less brokenness
-  make lib/localcharset.h
-  cd lib
-  make
+  android-${_pkg_arch}-configure
+  make $MAKEFLAGS
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver}/lib
-  make DESTDIR="$pkgdir" LIBDIR="$_prefix/lib" install
-  cp libcharset.a "$pkgdir/$_prefix/lib/libcharset.a"
-  cp libcharset.so "$pkgdir/$_prefix/lib/libcharset.so"
-  cd ..
-  mkdir -p "$pkgdir/$_prefix"/include
-  mv include/iconv.h "$pkgdir/$_prefix"/include
-  cd libcharset
-  mv include/libcharset.h "$pkgdir/$_prefix"/include
-  mv include/localcharset.h "$pkgdir/$_prefix"/include
+  cd $srcdir/${_pkgname}-${pkgver}
+  source android-env ${_pkg_arch}
+
+  make DESTDIR="$pkgdir" install
+  rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+  ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+  ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }
diff --git a/libiconv/android-x86/PKGBUILD b/libiconv/android-x86/PKGBUILD
index 5afe5a16..c0a71068 100644
--- a/libiconv/android-x86/PKGBUILD
+++ b/libiconv/android-x86/PKGBUILD
@@ -5,24 +5,16 @@
 _pkgname=libiconv
 _pkg_arch=x86
 _android_arch=x86
-_android_toolchain=$_pkg_arch-linux-android
 _android_platform=22
-_android_platform_arch=arch-x86
-_prefix=/opt/android-libs/$_pkg_arch
-_android_ndk_path=/opt/android-ndk
-_android_gcc_toolchain_path=$_android_ndk_path/toolchains/$_android_toolchain-4.9/prebuilt/linux-x86_64
-_android_gcc_tool_prefix=${_android_gcc_toolchain_path}/bin/${_android_toolchain}
-_android_clang_toolchain_path=$_android_ndk_path/toolchains/llvm/prebuilt/linux-x86_64/bin
-_android_sysroot=${_android_ndk_path}/platforms/android-$_android_platform/${_android_platform_arch}
 
 pkgname=android-$_pkg_arch-$_pkgname
 pkgver=1.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides libiconv.so and libcharset.so (Android $_pkg_arch)"
 arch=('any')
 url='http://www.gnu.org/software/libiconv/'
 license=('LGPL')
-makedepends=('android-ndk')
+makedepends=('android-ndk' 'android-configure')
 conflicts=("android-$_pkgname-$_android_arch")
 replaces=("android-$_pkgname-$_android_arch")
 source=("http://ftp.gnu.org/pub/gnu/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
@@ -31,59 +23,18 @@ options=(!libtool !buildflags staticlibs !strip !emptydirs)
 
 build() {
   cd $srcdir/${_pkgname}-${pkgver}
-  sed '/LD_RUN_PATH/d' -i Makefile.in
+  source android-env ${_pkg_arch}
 
-  # configure tools
-  export CPP=${PWD}/cpp.sh
-  export AR=${_android_gcc_tool_prefix}-ar
-  export AS=${_android_gcc_tool_prefix}-as
-  export NM=${_android_gcc_tool_prefix}-nm
-  export CC=${_android_clang_toolchain_path}/clang
-  export CXX=${_android_clang_toolchain_path}/clang++
-  export LD=${_android_gcc_tool_prefix}-ld
-  export RANLIB=${_android_gcc_tool_prefix}-ranlib
-  export STRIP=${_android_gcc_tool_prefix}-strip
-
-  # configure flags
-  export CFLAGS="${CFLAGS} --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} -I${_android_ndk_path}/sysroot/usr/include -I${_android_ndk_path}/sysroot/usr/include/${_android_toolchain} -I${_android_sysroot}/usr/include -I${_android_gcc_toolchain_path}/include -fexceptions -frtti"
-  export CPPFLAGS="${CFLAGS}"
-  export LDFLAGS="${LDFLAGS} -L${_android_sysroot}/usr/lib"
-
-  # setup preprocessor (because the NDK doesn't provide a wrapper like for gcc and g++)
-  printf "#!/bin/bash\nexec \"$CXX\" --target=${_android_toolchain} -E \"\$@\"" > "$CPP"
-  chmod +x "$CPP"
-
-  ./configure \
-    --host=$_android_toolchain \
-    --target=$_android_toolchain \
-    --build="$CHOST" \
-    --with-sysroot="${_android_sysroot}" \
-    --prefix="$_prefix" \
-    --libdir="$_prefix/lib" \
-    --includedir="$_prefix/include" \
-    --enable-shared=yes \
-    --enable-static=yes
-
-  # make sure the LDFLAGS are actually used (LDFLAGS are not passed otherwise)
-  local libtool_subst="s:\\\$CC -shared:\\\$CC -shared --target=${_android_toolchain} --gcc-toolchain=${_android_gcc_toolchain_path} --sysroot=${_android_sysroot} $LDFLAGS:g"
-  sed -i "$libtool_subst" libtool
-  sed -i "$libtool_subst" libcharset/libtool
-
-  # build target lib/localcharset.h and directory lib to experience less brokenness
-  make lib/localcharset.h
-  cd lib
-  make
+  android-${_pkg_arch}-configure
+  make $MAKEFLAGS
 }
 
 package() {
-  cd $srcdir/${_pkgname}-${pkgver}/lib
-  make DESTDIR="$pkgdir" LIBDIR="$_prefix/lib" install
-  cp libcharset.a "$pkgdir/$_prefix/lib/libcharset.a"
-  cp libcharset.so "$pkgdir/$_prefix/lib/libcharset.so"
-  cd ..
-  mkdir -p "$pkgdir/$_prefix"/include
-  mv include/iconv.h "$pkgdir/$_prefix"/include
-  cd libcharset
-  mv include/libcharset.h "$pkgdir/$_prefix"/include
-  mv include/localcharset.h "$pkgdir/$_prefix"/include
+  cd $srcdir/${_pkgname}-${pkgver}
+  source android-env ${_pkg_arch}
+
+  make DESTDIR="$pkgdir" install
+  rm -r "${pkgdir}"/${ANDROID_PREFIX_SHARE}
+  ${ANDROID_STRIP} -g --strip-unneeded "${pkgdir}"/${ANDROID_PREFIX_LIB}/*.so
+  ${ANDROID_STRIP} -g "$pkgdir"/${ANDROID_PREFIX_LIB}/*.a
 }