diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index c8283d8b35d..869510648eb 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -1,30 +1,31 @@
-# $OpenBSD: Makefile,v 1.6 2007/12/15 13:05:43 landry Exp $
+# $OpenBSD: Makefile,v 1.7 2009/01/30 22:45:10 landry Exp $
 
 COMMENT=		mpd client library
 
-DISTNAME=		libmpd-0.15.0
-SHARED_LIBS=		mpd	2.0
+VERSION=		0.17.0
+DISTNAME=		libmpd-${VERSION}
+SHARED_LIBS=		mpd	3.0
 CATEGORIES=		audio
 
 MAINTAINER=		Landry Breuil <gaston@gcu.info>
 
-HOMEPAGE=		http://sarine.nl/libmpd
+HOMEPAGE=		http://gmpcwiki.sarine.nl/index.php?title=Libmpd
 
-# GPL 
+# GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://download.sarine.nl/gmpc-0.15.5/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
-LIB_DEPENDS=		glib-2.0.>=1400::devel/glib2
-WANTLIB=		pcre iconv intl
+LIB_DEPENDS=		glib-2.0::devel/glib2
+WANTLIB=		pcre
 
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 
-MODULES=		gcc3
+MODULES=		devel/gettext gcc3
 MODGCC3_ARCHES= 	sparc
 MODGCC3_LANGS=		c
 
diff --git a/audio/libmpd/distinfo b/audio/libmpd/distinfo
index fc3cf9f7479..b8a078cd296 100644
--- a/audio/libmpd/distinfo
+++ b/audio/libmpd/distinfo
@@ -1,5 +1,5 @@
-MD5 (libmpd-0.15.0.tar.gz) = cj+Euy1C3u520uvqbbYWVg==
-RMD160 (libmpd-0.15.0.tar.gz) = 2fuo0unHWoF/T1p1oLfH65xF/AE=
-SHA1 (libmpd-0.15.0.tar.gz) = jEg0H/YzM0fxwBGd95hrDnL/PSo=
-SHA256 (libmpd-0.15.0.tar.gz) = S7KmgSgV739TIBG7hHAe18wBxxBKR+9RXEWz53zTSUM=
-SIZE (libmpd-0.15.0.tar.gz) = 386847
+MD5 (libmpd-0.17.0.tar.gz) = ZpBWjp+dIda3VWGByn2TGA==
+RMD160 (libmpd-0.17.0.tar.gz) = 36+l33d8T2w/YxhPlnIxb+H3Q1g=
+SHA1 (libmpd-0.17.0.tar.gz) = sVFGaD1iAhfVfjIELiOHR+SzLME=
+SHA256 (libmpd-0.17.0.tar.gz) = 8ntZMdR/WRMeCb2b2INQheL2FMoVhL+8rwCidRdW8XA=
+SIZE (libmpd-0.17.0.tar.gz) = 358418
diff --git a/audio/libmpd/pkg/PLIST b/audio/libmpd/pkg/PLIST
index 379ac340d20..b693b8aef24 100644
--- a/audio/libmpd/pkg/PLIST
+++ b/audio/libmpd/pkg/PLIST
@@ -1,16 +1,17 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/03/23 23:40:47 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2009/01/30 22:45:10 landry Exp $
 %%SHARED%%
-include/libmpd/
-include/libmpd/debug_printf.h
-include/libmpd/libmpd-database.h
-include/libmpd/libmpd-internal.h
-include/libmpd/libmpd-player.h
-include/libmpd/libmpd-playlist.h
-include/libmpd/libmpd-status.h
-include/libmpd/libmpd-strfsong.h
-include/libmpd/libmpd-version.h
-include/libmpd/libmpd.h
-include/libmpd/libmpdclient.h
+include/libmpd-1.0/
+include/libmpd-1.0/libmpd/
+include/libmpd-1.0/libmpd/debug_printf.h
+include/libmpd-1.0/libmpd/libmpd-database.h
+include/libmpd-1.0/libmpd/libmpd-internal.h
+include/libmpd-1.0/libmpd/libmpd-player.h
+include/libmpd-1.0/libmpd/libmpd-playlist.h
+include/libmpd-1.0/libmpd/libmpd-status.h
+include/libmpd-1.0/libmpd/libmpd-strfsong.h
+include/libmpd-1.0/libmpd/libmpd-version.h
+include/libmpd-1.0/libmpd/libmpd.h
+include/libmpd-1.0/libmpd/libmpdclient.h
 lib/libmpd.a
 lib/libmpd.la
 lib/pkgconfig/