diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index 00e708fd927..85ec7ee07ed 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2001/03/15 16:12:36 naddy Exp $
 
-DISTNAME=	libiconv-1.6
+DISTNAME=	libiconv-1.6.1
 CATEGORIES=	converters devel
 NEED_VERSION=	1.341
 MASTER_SITES=	ftp://ftp.ilog.fr/pub/Users/haible/gnu/
@@ -17,6 +17,6 @@ PERMIT_DISTFILES_FTP=	Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} --enable-static
 
-SEPARATE_BUILD=	Yes
+SEPARATE_BUILD=	concurrent
 
 .include <bsd.port.mk>
diff --git a/converters/libiconv/files/md5 b/converters/libiconv/files/md5
index c9464fe4a41..453412c855f 100644
--- a/converters/libiconv/files/md5
+++ b/converters/libiconv/files/md5
@@ -1,3 +1,3 @@
-MD5 (libiconv-1.6.tar.gz) = e79c022bb2d3e46f8608caa35a01b9f1
-RMD160 (libiconv-1.6.tar.gz) = 01ac8876def15a2533cd7c7e0307cca1ecf1b02b
-SHA1 (libiconv-1.6.tar.gz) = b760424c77f222f9067d663952342f2867774af6
+MD5 (libiconv-1.6.1.tar.gz) = 0117656ed71bc2929949583403cc7742
+RMD160 (libiconv-1.6.1.tar.gz) = 51c926f67a2c9fba4f45e97fd8e0547158c202f6
+SHA1 (libiconv-1.6.1.tar.gz) = 259abcc264a64873204714a8342fe085b6f34ac9
diff --git a/converters/libiconv/patches/patch-autoconf_ltconfig b/converters/libiconv/patches/patch-autoconf_ltconfig
index 6852ecfa833..cc025b79d68 100644
--- a/converters/libiconv/patches/patch-autoconf_ltconfig
+++ b/converters/libiconv/patches/patch-autoconf_ltconfig
@@ -1,6 +1,6 @@
-$OpenBSD: patch-autoconf_ltconfig,v 1.1.1.1 2001/03/12 01:32:05 naddy Exp $
---- autoconf/ltconfig.orig	Mon Feb 26 13:52:17 2001
-+++ autoconf/ltconfig	Mon Mar 12 01:39:20 2001
+$OpenBSD: patch-autoconf_ltconfig,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- autoconf/ltconfig.orig	Mon Feb 26 17:52:17 2001
++++ autoconf/ltconfig	Thu Mar 15 15:25:22 2001
 @@ -1099,6 +1099,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
diff --git a/converters/libiconv/patches/patch-autoconf_ltmain_sh b/converters/libiconv/patches/patch-autoconf_ltmain_sh
index 4f267d11878..8232bc1196f 100644
--- a/converters/libiconv/patches/patch-autoconf_ltmain_sh
+++ b/converters/libiconv/patches/patch-autoconf_ltmain_sh
@@ -1,6 +1,6 @@
-$OpenBSD: patch-autoconf_ltmain_sh,v 1.1.1.1 2001/03/12 01:32:05 naddy Exp $
---- autoconf/ltmain.sh.orig	Wed Feb 21 15:13:29 2001
-+++ autoconf/ltmain.sh	Mon Mar 12 01:39:12 2001
+$OpenBSD: patch-autoconf_ltmain_sh,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- autoconf/ltmain.sh.orig	Wed Feb 21 19:13:29 2001
++++ autoconf/ltmain.sh	Thu Mar 15 15:25:22 2001
 @@ -1079,7 +1079,18 @@ compiler."
  	    # These systems don't actually have c library (as such)
  	    continue
diff --git a/converters/libiconv/patches/patch-lib_Makefile_in b/converters/libiconv/patches/patch-lib_Makefile_in
index 3d37518feaf..2c4824ab4c4 100644
--- a/converters/libiconv/patches/patch-lib_Makefile_in
+++ b/converters/libiconv/patches/patch-lib_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-lib_Makefile_in,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
---- lib/Makefile.in.orig	Tue Mar  6 22:25:06 2001
-+++ lib/Makefile.in	Wed Mar  7 15:14:43 2001
+$OpenBSD: patch-lib_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- lib/Makefile.in.orig	Sun Mar 11 19:37:52 2001
++++ lib/Makefile.in	Thu Mar 15 15:25:22 2001
 @@ -79,7 +79,7 @@ iconv.lo : $(srcdir)/iconv.c $(srcdir)/c
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
diff --git a/converters/libiconv/patches/patch-libcharset_Makefile_in b/converters/libiconv/patches/patch-libcharset_Makefile_in
index fec25338f41..2a1391ef7be 100644
--- a/converters/libiconv/patches/patch-libcharset_Makefile_in
+++ b/converters/libiconv/patches/patch-libcharset_Makefile_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-libcharset_Makefile_in,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
+$OpenBSD: patch-libcharset_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
 --- libcharset/Makefile.in.orig	Wed Feb 21 00:42:12 2001
-+++ libcharset/Makefile.in	Wed Mar  7 15:14:43 2001
++++ libcharset/Makefile.in	Thu Mar 15 15:25:22 2001
 @@ -38,7 +38,7 @@ all : force
  install-lib : all force
  	cd lib && $(MAKE) install-lib libdir='$(libdir)' includedir='$(includedir)'
diff --git a/converters/libiconv/patches/patch-libcharset_autoconf_ltconfig b/converters/libiconv/patches/patch-libcharset_autoconf_ltconfig
index 8832320810f..d152e943153 100644
--- a/converters/libiconv/patches/patch-libcharset_autoconf_ltconfig
+++ b/converters/libiconv/patches/patch-libcharset_autoconf_ltconfig
@@ -1,6 +1,6 @@
-$OpenBSD: patch-libcharset_autoconf_ltconfig,v 1.1.1.1 2001/03/12 01:32:05 naddy Exp $
---- libcharset/autoconf/ltconfig.orig	Mon Feb 26 13:49:31 2001
-+++ libcharset/autoconf/ltconfig	Mon Mar 12 01:54:37 2001
+$OpenBSD: patch-libcharset_autoconf_ltconfig,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- libcharset/autoconf/ltconfig.orig	Mon Feb 26 17:49:31 2001
++++ libcharset/autoconf/ltconfig	Thu Mar 15 15:25:22 2001
 @@ -1105,6 +1105,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
diff --git a/converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh b/converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh
index d2b90dab42b..fc58956bbe9 100644
--- a/converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh
+++ b/converters/libiconv/patches/patch-libcharset_autoconf_ltmain_sh
@@ -1,6 +1,6 @@
-$OpenBSD: patch-libcharset_autoconf_ltmain_sh,v 1.1.1.1 2001/03/12 01:32:05 naddy Exp $
---- libcharset/autoconf/ltmain.sh.orig	Wed Feb 21 15:09:19 2001
-+++ libcharset/autoconf/ltmain.sh	Mon Mar 12 01:54:43 2001
+$OpenBSD: patch-libcharset_autoconf_ltmain_sh,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- libcharset/autoconf/ltmain.sh.orig	Wed Feb 21 19:09:19 2001
++++ libcharset/autoconf/ltmain.sh	Thu Mar 15 15:25:22 2001
 @@ -1079,7 +1079,18 @@ compiler."
  	    # These systems don't actually have c library (as such)
  	    continue
diff --git a/converters/libiconv/patches/patch-libcharset_lib_Makefile_in b/converters/libiconv/patches/patch-libcharset_lib_Makefile_in
index 6275d600d8c..49ebfe7ec8e 100644
--- a/converters/libiconv/patches/patch-libcharset_lib_Makefile_in
+++ b/converters/libiconv/patches/patch-libcharset_lib_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
---- libcharset/lib/Makefile.in.orig	Wed Feb 21 00:42:12 2001
-+++ libcharset/lib/Makefile.in	Wed Mar  7 15:14:43 2001
-@@ -24,6 +24,7 @@ LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=un
+$OpenBSD: patch-libcharset_lib_Makefile_in,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- libcharset/lib/Makefile.in.orig	Sun Mar 11 19:37:53 2001
++++ libcharset/lib/Makefile.in	Thu Mar 15 15:25:22 2001
+@@ -25,6 +25,7 @@ RM = rm -f
  # Programs used by "make install":
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
@@ -9,7 +9,7 @@ $OpenBSD: patch-libcharset_lib_Makefile_in,v 1.1.1.1 2001/03/12 01:32:04 naddy E
  MKINSTALLDIRS = $(SHELL) $(srcdir)/../autoconf/mkinstalldirs
  
  #### End of system configuration section. ####
-@@ -68,11 +69,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
+@@ -69,11 +70,11 @@ ref-del.sed : $(srcdir)/ref-del.sin
  # $(libdir) and $(includedir) - don't use $(prefix) and $(exec_prefix) here.
  install-lib : all force
  	$(MKINSTALLDIRS) $(libdir)
diff --git a/converters/libiconv/patches/patch-libcharset_lib_config_charset b/converters/libiconv/patches/patch-libcharset_lib_config_charset
index 38d6caaa15d..032bc41fdd4 100644
--- a/converters/libiconv/patches/patch-libcharset_lib_config_charset
+++ b/converters/libiconv/patches/patch-libcharset_lib_config_charset
@@ -1,6 +1,6 @@
-$OpenBSD: patch-libcharset_lib_config_charset,v 1.1.1.1 2001/03/12 01:32:04 naddy Exp $
---- libcharset/lib/config.charset.orig	Tue Mar  6 18:35:16 2001
-+++ libcharset/lib/config.charset	Wed Mar  7 15:14:43 2001
+$OpenBSD: patch-libcharset_lib_config_charset,v 1.2 2001/03/15 16:12:37 naddy Exp $
+--- libcharset/lib/config.charset.orig	Sun Mar 11 19:37:53 2001
++++ libcharset/lib/config.charset	Thu Mar 15 15:25:22 2001
 @@ -235,7 +235,7 @@ case "$os" in
  	#echo "sun_eu_greek ?" # what is this?
  	echo "UTF-8 UTF-8"