diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
new file mode 100644
index 00000000000..235f110c79b
--- /dev/null
+++ b/audio/libcddb/Makefile
@@ -0,0 +1,31 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2008/03/19 14:37:54 jasper Exp $
+
+COMMENT=		library to access data on a CDDB server
+
+DISTNAME=		libcddb-1.3.0
+CATEGORIES=		audio devel
+SHARED_LIBS +=	cddb                 0.0      # .4.3
+
+HOMEPAGE=		http://libcddb.sourceforge.net/
+
+# LGPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libcddb/}
+EXTRACT_SUFX=		.tar.bz2
+
+MODULES=		converters/libiconv
+
+WANTLIB=		c
+
+USE_LIBTOOL=		Yes
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--without-cdio
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.mk>
diff --git a/audio/libcddb/distinfo b/audio/libcddb/distinfo
new file mode 100644
index 00000000000..813d1f273fb
--- /dev/null
+++ b/audio/libcddb/distinfo
@@ -0,0 +1,5 @@
+MD5 (libcddb-1.3.0.tar.bz2) = 5Kf5V5lWwyt/MA6xLp6m3w==
+RMD160 (libcddb-1.3.0.tar.bz2) = 00WI9Ba6gOzssj/8/zMS/AtpnzA=
+SHA1 (libcddb-1.3.0.tar.bz2) = FxYYBF36dQdcbO1EbSXojyx8qIo=
+SHA256 (libcddb-1.3.0.tar.bz2) = Tn06rjOc9QN9lyzV86sjo7ZD9rBeQSVDDaTyJoJ3C/k=
+SIZE (libcddb-1.3.0.tar.bz2) = 329319
diff --git a/audio/libcddb/patches/patch-configure b/audio/libcddb/patches/patch-configure
new file mode 100644
index 00000000000..6c3b7f1cd0d
--- /dev/null
+++ b/audio/libcddb/patches/patch-configure
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.1.1.1 2008/03/19 14:37:54 jasper Exp $
+--- configure.orig	Wed Mar 19 15:32:43 2008
++++ configure	Wed Mar 19 15:33:43 2008
+@@ -23219,7 +23219,7 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+ s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+ s,@LIBCDIO_CFLAGS@,$LIBCDIO_CFLAGS,;t t
+ s,@LIBCDIO_LIBS@,$LIBCDIO_LIBS,;t t
+-s,@LIBICONV@,$LIBICONV,;t t
++s,@LIBICONV@,$LTLIBICONV,;t t
+ s,@LTLIBICONV@,$LTLIBICONV,;t t
+ s,@with_iconv@,$with_iconv,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
diff --git a/audio/libcddb/pkg/DESCR b/audio/libcddb/pkg/DESCR
new file mode 100644
index 00000000000..bb3cb9859da
--- /dev/null
+++ b/audio/libcddb/pkg/DESCR
@@ -0,0 +1,11 @@
+Libcddb is a C library to access data on a CDDB server (freedb.org). It
+allows you to:
+
+- Search the database for possible CD matches.
+- Retrieve detailed information about a specific CD.
+- Submit new CD entries to the database.
+
+Libcddb supports both the custom CDDB protocol and tunnelling the query
+and read operations over plain HTTP. It is also possible to use an HTTP
+proxy server. If you want to speed things up, you can make use of the
+built-in caching facility provided by the library.
diff --git a/audio/libcddb/pkg/PFRAG.shared b/audio/libcddb/pkg/PFRAG.shared
new file mode 100644
index 00000000000..673bc92806e
--- /dev/null
+++ b/audio/libcddb/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2008/03/19 14:37:54 jasper Exp $
+@lib lib/libcddb.so.${LIBcddb_VERSION}
diff --git a/audio/libcddb/pkg/PLIST b/audio/libcddb/pkg/PLIST
new file mode 100644
index 00000000000..72988064769
--- /dev/null
+++ b/audio/libcddb/pkg/PLIST
@@ -0,0 +1,18 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2008/03/19 14:37:54 jasper Exp $
+%%SHARED%%
+bin/cddb_query
+include/cddb/
+include/cddb/cddb.h
+include/cddb/cddb_cmd.h
+include/cddb/cddb_config.h
+include/cddb/cddb_conn.h
+include/cddb/cddb_disc.h
+include/cddb/cddb_error.h
+include/cddb/cddb_log.h
+include/cddb/cddb_site.h
+include/cddb/cddb_track.h
+include/cddb/version.h
+lib/libcddb.a
+lib/libcddb.la
+lib/pkgconfig/
+lib/pkgconfig/libcddb.pc