diff --git a/audio/mpc/Makefile b/audio/mpc/Makefile
new file mode 100644
index 00000000000..cd288a716f1
--- /dev/null
+++ b/audio/mpc/Makefile
@@ -0,0 +1,33 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/05/23 14:26:41 bernd Exp $
+
+COMMENT=		"command line client for mpd"
+
+DISTNAME=		mpc-0.11.2
+CATEGORIES=		audio
+
+HOMEPAGE=		http://www.musicpd.org/mpc.shtml
+
+MAINTAINER=		Tobias Ulmer <tobiasu@tmux.org>
+
+# GPLv2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=		c
+
+MASTER_SITES=		http://mercury.chem.pitt.edu/~shank/
+
+MODULES=		converters/libiconv
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS=		--with-iconv=${LOCALBASE}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mpc
+	${INSTALL_DATA} ${WRKSRC}/doc/m3u-handler.sh \
+		${WRKSRC}/doc/pls-handler.sh ${WRKSRC}/doc/mpc-bashrc \
+		${PREFIX}/share/examples/mpc
+
+.include <bsd.port.mk>
diff --git a/audio/mpc/distinfo b/audio/mpc/distinfo
new file mode 100644
index 00000000000..08114ae42f7
--- /dev/null
+++ b/audio/mpc/distinfo
@@ -0,0 +1,4 @@
+MD5 (mpc-0.11.2.tar.gz) = c8411da7936662312cf9483f3490e285
+RMD160 (mpc-0.11.2.tar.gz) = 823eca5e82fb4b2f4d219d70b176673575576a14
+SHA1 (mpc-0.11.2.tar.gz) = b318ffdf4d27c14f761070b83dec3a3433612586
+SIZE (mpc-0.11.2.tar.gz) = 103483
diff --git a/audio/mpc/patches/patch-doc_Makefile_in b/audio/mpc/patches/patch-doc_Makefile_in
new file mode 100644
index 00000000000..bed01a664dd
--- /dev/null
+++ b/audio/mpc/patches/patch-doc_Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2006/05/23 14:26:41 bernd Exp $
+--- doc/Makefile.in.orig	Mon May 15 20:18:31 2006
++++ doc/Makefile.in	Mon May 15 20:19:42 2006
+@@ -77,7 +77,7 @@ install_sh = @install_sh@
+ man_MANS = mpc.1
+ pkgdata_DATA = 
+ docdir = $(prefix)/share/doc/$(PACKAGE)
+-doc_DATA = mpc-bashrc m3u-handler.sh pls-handler.sh
++#doc_DATA = mpc-bashrc m3u-handler.sh pls-handler.sh
+ EXTRA_DIST = $(pkgdata_DATA) $(man_MANS) $(doc_DATA)
+ subdir = doc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/mpc/patches/patch-src_command_c b/audio/mpc/patches/patch-src_command_c
new file mode 100644
index 00000000000..500d5a6e119
--- /dev/null
+++ b/audio/mpc/patches/patch-src_command_c
@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_command_c,v 1.1.1.1 2006/05/23 14:26:41 bernd Exp $
+--- src/command.c.orig	Fri Mar 11 10:04:35 2005
++++ src/command.c	Mon May 15 20:09:35 2006
+@@ -183,10 +183,11 @@ int cmd_add (int argc, char ** argv, mpd
+ int cmd_crop( int argc, char ** argv, mpd_Connection * conn )
+ {
+ 
++	int length;
+ 	mpd_Status *status;
+ 	status = getStatus( conn );
+ 
+-	int length = ( status->playlistLength - 1 );
++	length = ( status->playlistLength - 1 );
+ 
+ 	if( status->playlistLength == 0 ) {
+ 
diff --git a/audio/mpc/pkg/DESCR b/audio/mpc/pkg/DESCR
new file mode 100644
index 00000000000..a4c1b1d059c
--- /dev/null
+++ b/audio/mpc/pkg/DESCR
@@ -0,0 +1 @@
+A command line tool to interface MPD.
diff --git a/audio/mpc/pkg/PLIST b/audio/mpc/pkg/PLIST
new file mode 100644
index 00000000000..1f10dbaef15
--- /dev/null
+++ b/audio/mpc/pkg/PLIST
@@ -0,0 +1,11 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2006/05/23 14:26:41 bernd Exp $
+bin/mpc
+@man man/man1/mpc.1
+share/doc/mpc/
+share/doc/mpc/AUTHORS
+share/doc/mpc/README
+share/examples/mpc/
+share/examples/mpc/m3u-handler.sh
+share/examples/mpc/mpc-bashrc
+share/examples/mpc/pls-handler.sh
+@comment share/mpc/