diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
new file mode 100644
index 00000000000..bb2aa99cfed
--- /dev/null
+++ b/databases/libdbi/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
+
+COMMENT =		database-independent abstraction layer
+DISTNAME =		libdbi-0.8.3
+CATEGORIES =		databases
+SHARED_LIBS +=		dbi 0.0 # .0.5
+
+HOMEPAGE =		http://libdbi.sourceforge.net/
+MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=libdbi/}
+
+MAINTAINER =		Michael Erdely <merdely@openbsd.org>
+
+# LGPLv2.1
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+USE_LIBTOOL =		Yes
+CONFIGURE_STYLE =	gnu
+WANTLIB =		m
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdbi
+	${INSTALL_DATA} ${WRKSRC}/doc/*.pdf ${PREFIX}/share/doc/libdbi
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdbi/driver-guide
+	${INSTALL_DATA} ${WRKSRC}/doc/driver-guide/*.html \
+		${PREFIX}/share/doc/libdbi/driver-guide
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libdbi/programmers-guide
+	${INSTALL_DATA} ${WRKSRC}/doc/programmers-guide/*.html \
+		${PREFIX}/share/doc/libdbi/programmers-guide
+
+.include <bsd.port.mk>
diff --git a/databases/libdbi/distinfo b/databases/libdbi/distinfo
new file mode 100644
index 00000000000..c7203bb19de
--- /dev/null
+++ b/databases/libdbi/distinfo
@@ -0,0 +1,5 @@
+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
diff --git a/databases/libdbi/patches/patch-Makefile_in b/databases/libdbi/patches/patch-Makefile_in
new file mode 100644
index 00000000000..73bc750a806
--- /dev/null
+++ b/databases/libdbi/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$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@
+ AUTOMAKE_OPTIONS = foreign dist-zip
+-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
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/databases/libdbi/patches/patch-configure b/databases/libdbi/patches/patch-configure
new file mode 100644
index 00000000000..82436b7dab4
--- /dev/null
+++ b/databases/libdbi/patches/patch-configure
@@ -0,0 +1,17 @@
+$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
+                 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" ;;
+         *)
+-                DEBUG="-g -Wall -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+-                CFLAGS="-O20 -D__NO_MATH_INLINES -fsigned-char -std=gnu99"
+-                PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char -std=gnu99" ;;
++                DEBUG="${DEBUG} -Wall -D__NO_MATH_INLINES -fsigned-char"
++                CFLAGS="${CFLAGS} -D__NO_MATH_INLINES -fsigned-char"
++                PROFILE="${PROFILE} -pg -D__NO_MATH_INLINES -fsigned-char"
++		;;
+         esac
+ fi
+ 
diff --git a/databases/libdbi/pkg/DESCR b/databases/libdbi/pkg/DESCR
new file mode 100644
index 00000000000..98a05fa4123
--- /dev/null
+++ b/databases/libdbi/pkg/DESCR
@@ -0,0 +1,4 @@
+libdbi implements a database-independent abstraction layer in C, similar
+to the DBI/DBD layer in Perl. Writing one generic set of code,
+programmers can leverage the power of multiple databases and multiple
+simultaneous database connections by using this framework.
diff --git a/databases/libdbi/pkg/PFRAG.shared b/databases/libdbi/pkg/PFRAG.shared
new file mode 100644
index 00000000000..84338d64d07
--- /dev/null
+++ b/databases/libdbi/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@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
new file mode 100644
index 00000000000..cb387c637c9
--- /dev/null
+++ b/databases/libdbi/pkg/PLIST
@@ -0,0 +1,54 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/06/02 00:57:57 merdely Exp $
+%%SHARED%%
+include/dbi/
+include/dbi/dbd.h
+include/dbi/dbi-dev.h
+include/dbi/dbi.h
+lib/libdbi.a
+lib/libdbi.la
+share/doc/libdbi/
+share/doc/libdbi/driver-guide/
+share/doc/libdbi/driver-guide.pdf
+share/doc/libdbi/driver-guide/contact.html
+share/doc/libdbi/driver-guide/copying-fdl.html
+share/doc/libdbi/driver-guide/description.html
+share/doc/libdbi/driver-guide/drivercaps.html
+share/doc/libdbi/driver-guide/driverfuncs-dbquery.html
+share/doc/libdbi/driver-guide/driverfuncs-infrastructure.html
+share/doc/libdbi/driver-guide/driverfuncs-publicdbquery.html
+share/doc/libdbi/driver-guide/driverfuncs.html
+share/doc/libdbi/driver-guide/gnugpl.html
+share/doc/libdbi/driver-guide/helperfuncs.html
+share/doc/libdbi/driver-guide/index.html
+share/doc/libdbi/driver-guide/intro.html
+share/doc/libdbi/driver-guide/requireddrivercaps.html
+share/doc/libdbi/driver-guide/settingdrivercaps.html
+share/doc/libdbi/driver-guide/terminology.html
+share/doc/libdbi/programmers-guide/
+share/doc/libdbi/programmers-guide.pdf
+share/doc/libdbi/programmers-guide/connerrors.html
+share/doc/libdbi/programmers-guide/contact.html
+share/doc/libdbi/programmers-guide/copying-fdl.html
+share/doc/libdbi/programmers-guide/description.html
+share/doc/libdbi/programmers-guide/errorhandling.html
+share/doc/libdbi/programmers-guide/errornumbers.html
+share/doc/libdbi/programmers-guide/gnugpl.html
+share/doc/libdbi/programmers-guide/index.html
+share/doc/libdbi/programmers-guide/intro.html
+share/doc/libdbi/programmers-guide/quickstart-code.html
+share/doc/libdbi/programmers-guide/quickstart-debriefing.html
+share/doc/libdbi/programmers-guide/quickstart.html
+share/doc/libdbi/programmers-guide/reference-conn.html
+share/doc/libdbi/programmers-guide/reference-core.html
+share/doc/libdbi/programmers-guide/reference-database.html
+share/doc/libdbi/programmers-guide/reference-driver.html
+share/doc/libdbi/programmers-guide/reference-field-idx.html
+share/doc/libdbi/programmers-guide/reference-field-meta.html
+share/doc/libdbi/programmers-guide/reference-field.html
+share/doc/libdbi/programmers-guide/reference-query.html
+share/doc/libdbi/programmers-guide/reference-results.html
+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