diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index cf6179f077f..3ecb0d6761e 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/21 08:45:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2014/03/28 07:38:08 ajacoutot Exp $
 
 COMMENT =		database-independent abstraction layer
-DISTNAME =		libdbi-0.8.3
+DISTNAME =		libdbi-0.8.4
 CATEGORIES =		databases
 SHARED_LIBS +=		dbi 0.0 # .0.5
 
diff --git a/databases/libdbi/distinfo b/databases/libdbi/distinfo
index c7203bb19de..794d015d6ca 100644
--- a/databases/libdbi/distinfo
+++ b/databases/libdbi/distinfo
@@ -1,5 +1,2 @@
-MD5 (libdbi-0.8.3.tar.gz) = ymbbeNR5y/pyfPMkW1hkrg==
-RMD160 (libdbi-0.8.3.tar.gz) = wmSpzw74XM2CMnOiBalhtuM3c88=
-SHA1 (libdbi-0.8.3.tar.gz) = vaYG+mYo7tRR5JIYLhlDvR2CTDM=
-SHA256 (libdbi-0.8.3.tar.gz) = cuQYVr67Haex/R5jaTWMKUkT8ynF5ZTjOLOYPmNppeM=
-SIZE (libdbi-0.8.3.tar.gz) = 1060714
+SHA256 (libdbi-0.8.4.tar.gz) = 7zjbYW8HUsywm4ui6sRxciNpuN7VCxU8JeI4ysLI3pk=
+SIZE (libdbi-0.8.4.tar.gz) = 1045247
diff --git a/databases/libdbi/patches/patch-Makefile_in b/databases/libdbi/patches/patch-Makefile_in
index 73bc750a806..ef03876b1d5 100644
--- a/databases/libdbi/patches/patch-Makefile_in
+++ b/databases/libdbi/patches/patch-Makefile_in
@@ -1,10 +1,10 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
---- Makefile.in.orig	Sun May 31 15:45:15 2009
-+++ Makefile.in	Sun May 31 15:45:27 2009
-@@ -180,7 +180,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+$OpenBSD: patch-Makefile_in,v 1.2 2014/03/28 07:38:09 ajacoutot Exp $
+--- Makefile.in.orig	Wed Sep  1 01:22:52 2010
++++ Makefile.in	Fri Mar 28 08:35:53 2014
+@@ -195,7 +195,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = foreign dist-zip
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src include @docs_subdirs@
 +SUBDIRS = src include
  EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README README.win32 README.osx TODO NEWS libdbi.spec.in config.h.in Makefile.w32 autogen.sh drivers/example/AUTHORS drivers/example/Makefile.am drivers/example/README drivers/example/TODO drivers/example/.cvsignore drivers/example/dbd_example.c drivers/example/dbd_example.h drivers/example/dbd_example.sgml
diff --git a/databases/libdbi/patches/patch-configure b/databases/libdbi/patches/patch-configure
index 82436b7dab4..2b470568fb6 100644
--- a/databases/libdbi/patches/patch-configure
+++ b/databases/libdbi/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
---- configure.orig	Wed Feb  6 14:40:11 2008
-+++ configure	Sun May 31 15:46:40 2009
-@@ -19264,9 +19264,10 @@ else
+$OpenBSD: patch-configure,v 1.2 2014/03/28 07:38:09 ajacoutot Exp $
+--- configure.orig	Wed Sep  1 01:22:52 2010
++++ configure	Fri Mar 28 08:35:19 2014
+@@ -11210,9 +11210,10 @@ else
                  CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99"
                  PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8 -std=gnu99" ;;
          *)
diff --git a/databases/libdbi/pkg/PFRAG.shared b/databases/libdbi/pkg/PFRAG.shared
deleted file mode 100644
index 84338d64d07..00000000000
--- a/databases/libdbi/pkg/PFRAG.shared
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
-@lib lib/libdbi.so.${LIBdbi_VERSION}
diff --git a/databases/libdbi/pkg/PLIST b/databases/libdbi/pkg/PLIST
index cb387c637c9..6ffd5fab92a 100644
--- a/databases/libdbi/pkg/PLIST
+++ b/databases/libdbi/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST,v 1.2 2014/03/28 07:38:09 ajacoutot Exp $
 include/dbi/
 include/dbi/dbd.h
 include/dbi/dbi-dev.h
 include/dbi/dbi.h
 lib/libdbi.a
 lib/libdbi.la
+@lib lib/libdbi.so.${LIBdbi_VERSION}
 share/doc/libdbi/
 share/doc/libdbi/driver-guide/
 share/doc/libdbi/driver-guide.pdf
@@ -51,4 +51,3 @@ share/doc/libdbi/programmers-guide/reference.html
 share/doc/libdbi/programmers-guide/terminology.html
 share/doc/libdbi/programmers-guide/x267.html
 share/doc/libdbi/programmers-guide/x276.html
-share/doc/libdbi/programmers-guide/x278.html