diff --git a/patches/parted-devmapper-1.patch b/patches/parted-device-mapper.patch
similarity index 100%
rename from patches/parted-devmapper-1.patch
rename to patches/parted-device-mapper.patch
diff --git a/patches/parted-iconv.patch b/patches/parted-iconv.patch
new file mode 100644
index 00000000..aae6a135
--- /dev/null
+++ b/patches/parted-iconv.patch
@@ -0,0 +1,46 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -288,6 +288,8 @@ fi
+ AC_PROG_LIBTOOL
+ LT_INIT
+ 
++AM_ICONV
++
+ AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ if test "$USE_INCLUDED_LIBINTL" = "yes"; then
+--- a/parted/Makefile.am
++++ b/parted/Makefile.am
+@@ -41,7 +41,8 @@ parted_LDADD = \
+   libver.a \
+   $(top_builddir)/libparted/libparted.la \
+   $(INTLLIBS) $(LIBS) \
+-  $(PARTED_LIBS)
++  $(PARTED_LIBS) \
++  $(LIBICONV)
+ 
+ parted_LDFLAGS = $(PARTEDLDFLAGS)
+ 
+--- a/partprobe/Makefile.am
++++ b/partprobe/Makefile.am
+@@ -9,7 +9,8 @@ partprobe_SOURCES = partprobe.c
+ partprobe_LDADD = \
+   $(top_builddir)/libparted/libparted.la \
+   $(INTLLIBS) $(LIBS) \
+-  $(PARTED_LIBS)
++  $(PARTED_LIBS) \
++  $(LIBICONV)
+ 
+ partprobe_LDFLAGS = $(PARTEDLDFLAGS)
+ 
+--- a/libparted/labels/Makefile.am
++++ b/libparted/labels/Makefile.am
+@@ -35,7 +35,7 @@ liblabels_la_SOURCES = \
+   rdb.c		\
+   sun.c
+ 
+-liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS)
++liblabels_la_LIBADD = $(OS_LIBS) $(INTLLIBS) $(LIBICONV)
+ 
+ AM_CPPFLAGS = $(partedincludedir) $(INTLINCS)
+ 
diff --git a/patches/ushare-disable-iconv-check.patch b/patches/ushare-disable-iconv-check.patch
new file mode 100644
index 00000000..72592ea0
--- /dev/null
+++ b/patches/ushare-disable-iconv-check.patch
@@ -0,0 +1,15 @@
+diff --git a/configure b/configure
+index ef8fb4e..609ea82 100755
+--- a/configure
++++ b/configure
+@@ -659,8 +659,8 @@ check_lib langinfo.h nl_langinfo "" && add_cflags -DHAVE_LANGINFO_CODESET
+ #################################################
+ #   check for iconv (optional)
+ #################################################
+-echolog "Checking for iconv ..."
+-check_lib iconv.h iconv "" && add_cflags -DHAVE_ICONV
++#echolog "Checking for iconv ..."
++#check_lib iconv.h iconv "" && add_cflags -DHAVE_ICONV
+ 
+ #################################################
+ #   check for libupnp and friends (mandatory)