diff --git a/audio/mpd/Makefile b/audio/mpd/Makefile
index 6b041befd82..b6097487f01 100644
--- a/audio/mpd/Makefile
+++ b/audio/mpd/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.5 2007/05/20 13:05:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.6 2007/06/22 11:42:14 jasper Exp $
 
 COMMENT=		"Music Player Daemon"
-DISTNAME=		mpd-0.12.2
+DISTNAME=		mpd-0.13.0
 CATEGORIES=		audio
 HOMEPAGE=		http://www.musicpd.org/
 MAINTAINER=		Tobias Ulmer <tobiasu@tmux.org>
@@ -20,6 +20,7 @@ MODULES=		converters/libiconv
 
 LIB_DEPENDS=		audiofile::devel/libaudiofile \
 			ao::audio/libao \
+			samplerate::audio/libsamplerate \
 			faad::audio/faad \
 			id3tag::audio/libid3tag \
 			mad::audio/libmad \
diff --git a/audio/mpd/distinfo b/audio/mpd/distinfo
index d8cec86bc68..545108a1ad9 100644
--- a/audio/mpd/distinfo
+++ b/audio/mpd/distinfo
@@ -1,5 +1,5 @@
-MD5 (mpd-0.12.2.tar.gz) = bHJO0u+3D40uOt/DcO/i6g==
-RMD160 (mpd-0.12.2.tar.gz) = adqqySs2GaDuzukYFg7RFnxsbGA=
-SHA1 (mpd-0.12.2.tar.gz) = eqNafAwOElGxkavYDtf4hMtSGPg=
-SHA256 (mpd-0.12.2.tar.gz) = UvJ1AOS9dvLfLS77dsWlYOI2dtgwIaQ6ukqVzwG1RrU=
-SIZE (mpd-0.12.2.tar.gz) = 537988
+MD5 (mpd-0.13.0.tar.gz) = CzO9udcGQ5lJNEBz6Q+BKg==
+RMD160 (mpd-0.13.0.tar.gz) = 2mUXG7BiMF8SLlolmEheXY/16Nc=
+SHA1 (mpd-0.13.0.tar.gz) = lvk5s9kmxblddhXBpeeGD01fzZQ=
+SHA256 (mpd-0.13.0.tar.gz) = afb6nPbL6ahxrNEyXyopjFmk+KUbnHyQ3Ea6QRUPbEA=
+SIZE (mpd-0.13.0.tar.gz) = 556631
diff --git a/audio/mpd/patches/patch-configure b/audio/mpd/patches/patch-configure
index 64c70a23db3..dca0bd2ec32 100644
--- a/audio/mpd/patches/patch-configure
+++ b/audio/mpd/patches/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Apr 20 22:42:09 2007
-+++ configure	Fri Apr 20 22:43:20 2007
-@@ -28410,7 +28410,7 @@
+--- configure.orig	Mon May 28 15:20:18 2007
++++ configure	Fri Jun 22 13:31:06 2007
+@@ -28646,7 +28646,7 @@ fi
      LIBOGGFLAC_LIBS="-L$libdir"
    fi
  
diff --git a/audio/mpd/patches/patch-doc_mpdconf_example b/audio/mpd/patches/patch-doc_mpdconf_example
index 8309959a878..f00d11ec6c9 100644
--- a/audio/mpd/patches/patch-doc_mpdconf_example
+++ b/audio/mpd/patches/patch-doc_mpdconf_example
@@ -1,6 +1,6 @@
-$OpenBSD: patch-doc_mpdconf_example,v 1.3 2006/11/05 14:42:56 bernd Exp $
---- doc/mpdconf.example.orig	Wed Oct 11 01:56:54 2006
-+++ doc/mpdconf.example	Fri Oct 27 20:07:43 2006
+$OpenBSD: patch-doc_mpdconf_example,v 1.4 2007/06/22 11:42:14 jasper Exp $
+--- doc/mpdconf.example.orig	Mon May 28 15:19:30 2007
++++ doc/mpdconf.example	Fri Jun 22 13:31:06 2007
 @@ -2,11 +2,11 @@
  # See the mpd.conf man page for a more detailed description of each parameter.
  
@@ -18,7 +18,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.3 2006/11/05 14:42:56 bernd Exp $
  ################################################################
  
  
-@@ -15,13 +15,13 @@ error_file                      "~/.mpd/
+@@ -15,13 +15,13 @@ error_file                      "~/.mpd/mpd.error"
  # If you wish to use mpd --kill to stop MPD, then you must
  # specify a file here in which to store MPD's process ID.
  #
@@ -34,7 +34,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.3 2006/11/05 14:42:56 bernd Exp $
  #
  ################################################################
  
-@@ -33,11 +33,11 @@ error_file                      "~/.mpd/
+@@ -33,11 +33,11 @@ error_file                      "~/.mpd/mpd.error"
  # started by.  If left unspecified, MPD will not drop root
  # privileges at all (not recommended).
  #
@@ -48,7 +48,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.3 2006/11/05 14:42:56 bernd Exp $
  #port                            "6600"
  #
  # Controls the amount of information that is logged.  Can be
-@@ -94,6 +94,12 @@ error_file                      "~/.mpd/
+@@ -100,6 +100,12 @@ error_file                      "~/.mpd/mpd.error"
  #        format                  "44100:16:2" # optional
  #}
  #
@@ -61,7 +61,7 @@ $OpenBSD: patch-doc_mpdconf_example,v 1.3 2006/11/05 14:42:56 bernd Exp $
  # An example of a shout output (for streaming to Icecast):
  #
  #audio_output {
-@@ -136,12 +142,12 @@ error_file                      "~/.mpd/
+@@ -149,12 +155,12 @@ error_file                      "~/.mpd/mpd.error"
  #
  #mixer_type                      "oss"
  #mixer_device                    "/dev/mixer"