diff --git a/mingw-w64-libiconv/0001-compile-relocatable-in-gnulib.mingw.patch b/mingw-w64-libiconv/0001-compile-relocatable-in-gnulib.mingw.patch
new file mode 100644
index 0000000000..7dc994d658
--- /dev/null
+++ b/mingw-w64-libiconv/0001-compile-relocatable-in-gnulib.mingw.patch
@@ -0,0 +1,11 @@
+--- libiconv-1.14/configure.orig	2013-03-30 13:27:14 +0400
++++ libiconv-1.14/configure	2013-03-30 13:39:32 +0400
+@@ -20326,7 +20326,7 @@
+ 
+ 
+ 
+-  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext"
++  gl_LIBOBJS="$gl_LIBOBJS progreloc.$ac_objext relocatable.$ac_objext"
+ 
+ fi
+ 
diff --git a/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch b/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch
new file mode 100644
index 0000000000..16a3482166
--- /dev/null
+++ b/mingw-w64-libiconv/0002-fix-cr-for-awk-in-configure.all.patch
@@ -0,0 +1,33 @@
+--- libiconv-1.14/configure.orig	2013-08-04 19:13:45.059307100 +0000
++++ libiconv-1.14/configure	2013-08-04 19:14:09.009348300 +0000
+@@ -22903,7 +22903,7 @@
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
++  ac_cs_awk_cr='\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+--- libiconv-1.14/libcharset/configure.orig	2011-08-07 17:49:19.000000000 +0000
++++ libiconv-1.14/libcharset/configure	2013-08-04 19:14:51.014182300 +0000
+@@ -12364,7 +12364,7 @@
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
++  ac_cs_awk_cr='\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+--- libiconv-1.14/preload/configure.orig	2010-09-23 23:33:42.000000000 +0000
++++ libiconv-1.14/preload/configure	2013-08-04 19:15:09.286002500 +0000
+@@ -12247,7 +12247,7 @@
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
++  ac_cs_awk_cr='\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
diff --git a/mingw-w64-libiconv/PKGBUILD b/mingw-w64-libiconv/PKGBUILD
index d17076475f..06ea786676 100644
--- a/mingw-w64-libiconv/PKGBUILD
+++ b/mingw-w64-libiconv/PKGBUILD
@@ -4,24 +4,39 @@ _realname=libiconv
 _mingw_suff=mingw-w64-${CARCH}
 pkgname=("${_mingw_suff}-${_realname}")
 pkgver=1.14
-pkgrel=1
+pkgrel=2
 pkgdesc='Libiconv is a conversion library'
 groups=("${_mingw_suff}")
 arch=('any')
 url='http://www.gnu.org/software/libiconv/'
 license=('LGPL')
-source=("http://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.gz")
-md5sums=('e34509b1623cec449dfeb73d7ce9c6c6')
+source=("http://ftp.gnu.org/pub/gnu/${_realname}/${_realname}-${pkgver}.tar.gz"
+        0001-compile-relocatable-in-gnulib.mingw.patch
+        0002-fix-cr-for-awk-in-configure.all.patch)
+md5sums=('e34509b1623cec449dfeb73d7ce9c6c6'
+         '8818b7fe31286f589d180713329eb893'
+         '9e955ee7135d39970a086451d4b87520')
 options=('!libtool' 'staticlibs')
 
+prepare() {
+  cd $srcdir/${_realname}-${pkgver}
+  patch -p1 -i ${srcdir}/0001-compile-relocatable-in-gnulib.mingw.patch
+  patch -p1 -i ${srcdir}/0002-fix-cr-for-awk-in-configure.all.patch
+}
+
 build() {
   cd $srcdir/${_realname}-${pkgver}
   ./configure --prefix=${MINGW_PREFIX} \
-  --build=${MINGW_CHOST} \
-  --host=${MINGW_CHOST} \
-  --target=${MINGW_CHOST} \
-  --enable-static \
-  --enable-shared
+    --build=${MINGW_CHOST} \
+    --host=${MINGW_CHOST} \
+    --target=${MINGW_CHOST} \
+    --enable-static \
+    --enable-shared \
+    --enable-extra-encodings \
+    --enable-relocatable \
+    --disable-rpath \
+    --enable-silent-rules \
+    --enable-nls
   make
 }