diff --git a/databases/oracle_odbc_driver/Makefile b/databases/oracle_odbc_driver/Makefile
index b98faf4b114d..308bea51c205 100644
--- a/databases/oracle_odbc_driver/Makefile
+++ b/databases/oracle_odbc_driver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	oracle_odbc_driver
-PORTVERSION=	0.5.5
-PORTREVISION=	1
+PORTVERSION=	0.5.6
 CATEGORIES=	databases
 MASTER_SITES=	http://home.fnal.gov/~dbox/oracle/odbc/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -26,9 +25,11 @@ ORACLE_HOME=	${LOCALBASE}/oracle8-client
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}" \
-		LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"
+		LIBS="`${CAT} ${ORACLE_HOME}/lib/sysliblist`"\
+		AUTOHEADER=true
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool:15
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/-lclntst8 -lcompat -lpthread -lm/-lclntst8 -lcompat ${PTHREAD_LIBS} -lm/' ${WRKSRC}/configure
diff --git a/databases/oracle_odbc_driver/distinfo b/databases/oracle_odbc_driver/distinfo
index 9dc570c94775..1770f12b3f5e 100644
--- a/databases/oracle_odbc_driver/distinfo
+++ b/databases/oracle_odbc_driver/distinfo
@@ -1,3 +1,3 @@
-MD5 (oracle_odbc_driver.0.5.5.tar.gz) = 77a576b947437e915491ecd30f036c85
-SHA256 (oracle_odbc_driver.0.5.5.tar.gz) = 683de004c4517e64d74c4c248b18245db56bfdc38990842a5d4429e5fec76aac
-SIZE (oracle_odbc_driver.0.5.5.tar.gz) = 483118
+MD5 (oracle_odbc_driver.0.5.6.tar.gz) = 2a27268a088586c044f7ffa93ee2122b
+SHA256 (oracle_odbc_driver.0.5.6.tar.gz) = 8c41adc9df122c7b9b4bdda213465ee3ea9ebe5c0dd5e75120bd7e585499c898
+SIZE (oracle_odbc_driver.0.5.6.tar.gz) = 422133
diff --git a/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c b/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c
index e11fec3729ed..e264831fff1a 100644
--- a/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c
+++ b/databases/oracle_odbc_driver/files/patch-src-oracle_functions.c
@@ -1,18 +1,18 @@
---- src/oracle_functions.c.orig	Wed Jun  8 19:39:20 2005
-+++ src/oracle_functions.c	Wed Jun  8 19:39:32 2005
-@@ -48,6 +48,7 @@
- 
- long local_min(long a, long b){if(a<b)return a; return b;}
- 
-+#if 0
- int epc_exit_handler()
- {
-   /* in oracle 8.1.6 and 8.1.7 libclntsh.so registers an
-@@ -65,6 +66,7 @@
-     printf("neener neener caught the exit handler bug!\n");
-   return 0;
- }
-+#endif
- 
- #ifdef UNIX_DEBUG
- /*
+--- src/oracle_functions.c.orig	Tue Jul  3 23:11:11 2007
++++ src/oracle_functions.c	Tue Jul  3 23:11:24 2007
+@@ -50,6 +50,7 @@
+ 
+ long local_min(long a, long b){if(a<b)return a; return b;}
+ 
++#if 0
+ int epc_exit_handler()
+ {
+   /* in oracle 8.1.6 and 8.1.7 libclntsh.so registers an
+@@ -67,6 +68,7 @@
+     printf("neener neener caught the exit handler bug!\n");
+   return 0;
+ }
++#endif
+ 
+ #ifdef UNIX_DEBUG
+ /*