diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile
index 55d94987086..a2398bf9864 100644
--- a/databases/iodbc/Makefile
+++ b/databases/iodbc/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.9 2006/01/10 18:47:52 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2006/07/18 19:44:27 alek Exp $
 
-COMMENT=	"ODBC 2.x driver manager"
+COMMENT=	"ODBC 3.x driver manager"
 
-DISTNAME=	libiodbc-2.50.3
-PKGNAME=	iodbc-2.50.3p0
+DISTNAME=	libiodbc-3.52.4
+PKGNAME=	${DISTNAME:S/lib//}
 CATEGORIES=	databases
-SHARED_LIBS=	iodbc	2.50
+SHARED_LIBS=	iodbc		3.15 \
+		iodbcinst	3.15
 
 HOMEPAGE=	http://www.iodbc.org/
 
@@ -16,20 +17,20 @@ PERMIT_PACKAGE_CDROM=	yes
 PERMIT_PACKAGE_FTP=	yes
 PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
+WANTLIB=		c pthread
 
 MASTER_SITES=	${HOMEPAGE}downloads/iODBC/
 
 USE_LIBTOOL=	Yes
 
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --with-iodbc-inidir="${SYSCONFDIR}"
+CONFIGURE_ARGS= --with-iodbc-inidir="${SYSCONFDIR}/iodbc" \
+		--disable-gui \
+		--disable-libodbc
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/iodbc
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/iodbc
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/iodbc
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/iodbc
-	${INSTALL_DATA} ${WRKSRC}/odbc.ini.sample \
-		${PREFIX}/share/examples/iodbc/odbc.ini
+	${INSTALL_DATA} ${WRKSRC}/etc/*.ini.sample \
+		${PREFIX}/share/examples/iodbc
 
 .include <bsd.port.mk>
diff --git a/databases/iodbc/distinfo b/databases/iodbc/distinfo
index 1dfaf03f94c..dfe849607ab 100644
--- a/databases/iodbc/distinfo
+++ b/databases/iodbc/distinfo
@@ -1,4 +1,4 @@
-MD5 (libiodbc-2.50.3.tar.gz) = 5d23b748d4c57d61a004395cea5ff0f0
-RMD160 (libiodbc-2.50.3.tar.gz) = e224c023ac039ba35566f3a7a0d79e493d83971f
-SHA1 (libiodbc-2.50.3.tar.gz) = 00586122fe823fac67031c3d4866a817c19f4f33
-SIZE (libiodbc-2.50.3.tar.gz) = 167249
+MD5 (libiodbc-3.52.4.tar.gz) = 65ddf72600ff5d15fcd6002e2ed36307
+RMD160 (libiodbc-3.52.4.tar.gz) = e0f3e15f282394821a5515791535d0a576d61368
+SHA1 (libiodbc-3.52.4.tar.gz) = 1fd95bf06e0f289c8aa813780624bac7a1cfca2d
+SIZE (libiodbc-3.52.4.tar.gz) = 722305
diff --git a/databases/iodbc/patches/patch-configure b/databases/iodbc/patches/patch-configure
new file mode 100644
index 00000000000..1cb3cf398e3
--- /dev/null
+++ b/databases/iodbc/patches/patch-configure
@@ -0,0 +1,21 @@
+$OpenBSD: patch-configure,v 1.1 2006/07/18 19:44:27 alek Exp $
+--- configure.orig	Sun Jun 25 14:32:14 2006
++++ configure	Sun Jun 25 14:32:18 2006
+@@ -22774,7 +22774,7 @@ fi
+ 	echo "$as_me:$LINENO: checking for pthread_mutex_lock in -lpthread " >&5
+ echo $ECHO_N "checking for pthread_mutex_lock in -lpthread ... $ECHO_C" >&6
+ ac_save_LIBS="$LIBS"
+-LIBS="-lpthread  $LIBS"
++LIBS="-pthread  $LIBS"
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -22835,7 +22835,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-	    LIBS="$LIBS -lpthread"
++	    LIBS="$LIBS -pthread"
+ 	    found_lib=true
+ 
+ else
diff --git a/databases/iodbc/patches/patch-henv.ci b/databases/iodbc/patches/patch-henv.ci
deleted file mode 100644
index 350dced9eed..00000000000
--- a/databases/iodbc/patches/patch-henv.ci
+++ /dev/null
@@ -1,16 +0,0 @@
---- henv.ci.orig	Sat Apr 24 03:39:14 1999
-+++ henv.ci	Tue Nov 28 10:55:35 2000
-@@ -29,12 +29,10 @@
-  * on HP/UX s300/s400, CLI_NAME_PREFIX is defined in Config.mk as "_SQL" 
-  * on AIX 3.x 4.x,     CLI_NAME_PREFIX is defined in Config.mk as ".SQL" 
-  */
--#ifndef	CLI_NAME_PREFIX
-+#ifndef	NEED_USCORE
- #  define CLI_NAME_PREFIX	"SQL"	/* using call by value prefix */ 
- #else
--# ifdef USE_SYMBOL_UNDERSCORE
- #  define CLI_NAME_PREFIX	"_SQL"
--# endif
- #endif
- 
- static struct
diff --git a/databases/iodbc/patches/patch-include_sqltypes_h b/databases/iodbc/patches/patch-include_sqltypes_h
new file mode 100644
index 00000000000..60abea34042
--- /dev/null
+++ b/databases/iodbc/patches/patch-include_sqltypes_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-include_sqltypes_h,v 1.1 2006/07/18 19:44:27 alek Exp $
+--- include/sqltypes.h.orig	Thu Jan 26 10:50:59 2006
++++ include/sqltypes.h	Sun Jun 25 14:26:29 2006
+@@ -396,7 +396,7 @@ typedef unsigned short SQLWCHAR;
+ 
+ #  if defined(__cplusplus)		|| \
+       defined(_WCHAR_T)			|| \
+-      defined(_WCHAR_T_DEFINED)		|| \
++      defined(_WCHAR_T_DEFINED_)	|| \
+       defined(_WCHAR_T_DECLARED)        || \
+       defined(_BSD_WCHAR_T_DEFINED_)    || \
+       defined(_BSD_WCHAR_T_)
diff --git a/databases/iodbc/patches/patch-samples_Makefile_in b/databases/iodbc/patches/patch-samples_Makefile_in
new file mode 100644
index 00000000000..8532c49132b
--- /dev/null
+++ b/databases/iodbc/patches/patch-samples_Makefile_in
@@ -0,0 +1,16 @@
+$OpenBSD: patch-samples_Makefile_in,v 1.1 2006/07/18 19:44:27 alek Exp $
+--- samples/Makefile.in.orig	Sun Jun 25 15:50:39 2006
++++ samples/Makefile.in	Sun Jun 25 15:51:08 2006
+@@ -571,9 +571,9 @@ uninstall-am: uninstall-binPROGRAMS unin
+ 
+ 
+ install-exec-hook:
+-	$(mkinstalldirs) ${DESTDIR}${pkgdatadir}/samples
+-	cp $(srcdir)/iodbctest.c ${DESTDIR}${pkgdatadir}/samples/iodbctest.c
+-	cp $(srcdir)/Makefile.sample ${DESTDIR}${pkgdatadir}/samples/Makefile
++	$(mkinstalldirs) ${DESTDIR}${datadir}/examples/iodbc
++	cp $(srcdir)/iodbctest.c ${DESTDIR}${datadir}/examples/iodbc/iodbctest.c
++	cp $(srcdir)/Makefile.sample ${DESTDIR}${datadir}/examples/iodbc/Makefile
+ 
+ uninstall-hook:
+ 	rm -f ${DESTDIR}${pkgdatadir}/samples/iodbctest.c
diff --git a/databases/iodbc/pkg/PFRAG.shared b/databases/iodbc/pkg/PFRAG.shared
index 51c52b194eb..92ac0f14159 100644
--- a/databases/iodbc/pkg/PFRAG.shared
+++ b/databases/iodbc/pkg/PFRAG.shared
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.3 2005/12/26 21:32:01 sturm Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.4 2006/07/18 19:44:27 alek Exp $
 @lib lib/libiodbc.so.${LIBiodbc_VERSION}
+@lib lib/libiodbcinst.so.${LIBiodbcinst_VERSION}
diff --git a/databases/iodbc/pkg/PLIST b/databases/iodbc/pkg/PLIST
index 9db9da7a721..aa01b12aaf9 100644
--- a/databases/iodbc/pkg/PLIST
+++ b/databases/iodbc/pkg/PLIST
@@ -1,15 +1,33 @@
-@comment $OpenBSD: PLIST,v 1.3 2004/08/08 16:50:45 espie Exp $
+@comment $OpenBSD: PLIST,v 1.4 2006/07/18 19:44:27 alek Exp $
+%%SHARED%%
+bin/iodbc-config
+bin/iodbctest
+bin/iodbctestw
+include/iodbcext.h
+include/iodbcinst.h
+include/iodbcunix.h
 include/isql.h
 include/isqlext.h
 include/isqltypes.h
+include/odbcinst.h
 include/sql.h
 include/sqlext.h
 include/sqltypes.h
+include/sqlucode.h
 lib/libiodbc.a
 lib/libiodbc.la
-share/doc/iodbc/
-share/doc/iodbc/COPYING
-share/doc/iodbc/README
+lib/libiodbcinst.a
+lib/libiodbcinst.la
+lib/pkgconfig/
+lib/pkgconfig/libiodbc.pc
+@man man/man1/iodbc-config.1
+@man man/man1/iodbctest.1
+@man man/man1/iodbctestw.1
 share/examples/iodbc/
-share/examples/iodbc/odbc.ini
-%%SHARED%%
+@sample ${SYSCONFDIR}/iodbc/
+share/examples/iodbc/Makefile
+share/examples/iodbc/iodbctest.c
+share/examples/iodbc/odbc.ini.sample
+@sample ${SYSCONFDIR}/iodbc/odbc.ini
+share/examples/iodbc/odbcinst.ini.sample
+@sample ${SYSCONFDIR}/iodbc/odbcinst.ini