diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 20617146c5c..4c492e5632a 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,29 +1,25 @@
 # Template file for 'mpd'
 pkgname=mpd
-version=0.17.6
-revision=2
+version=0.18.3
+revision=1
 build_style=gnu-configure
 configure_args="
- --enable-jack --enable-lastfm --enable-soundcloud --enable-pipe-output
- --enable-pulse --disable-sidplay --with-systemdsystemunitdir=/usr/lib/systemd/system
+ --enable-soundcloud --enable-pipe-output --disable-twolame-encoder
+ --disable-sidplay --with-systemdsystemunitdir=/usr/lib/systemd/system
  --enable-bzip2 --enable-zzip"
 hostmakedepends="pkg-config"
 makedepends="
  ffmpeg-devel>=2.1 libmodplug-devel libmad-devel libcurl-devel faad2-devel
- sqlite-devel jack-devel libmms-devel wavpack-devel avahi-glib-libs-devel libid3tag-devel
- yajl-devel>=2.0.4 pulseaudio-devel libogg-devel libflac-devel libsoup-devel bzip2-devel
+ sqlite-devel libmms-devel avahi-glib-libs-devel libid3tag-devel
+ yajl-devel>=2.0.4 libogg-devel libflac-devel libsoup-devel bzip2-devel
  libmikmod-devel libsndfile-devel alsa-lib-devel mpg123-devel libsamplerate-devel
- libcdio-devel libmpcdec-devel systemd-devel zziplib-devel"
+ libcdio-devel systemd-devel zziplib-devel libmpdclient-devel"
 short_desc="Flexible, powerful, server-side application for playing music"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-3"
 homepage="http://www.musicpd.org/"
 distfiles="http://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz"
-checksum=defd23931bd3f0aaee82a079a0583278e51e25f480509a93bc5f70de7f421906
-
-pre_configure() {
-	sed 's:AVCODEC_MAX_AUDIO_FRAME_SIZE:192000:g' -i src/decoder/ffmpeg_decoder_plugin.c
-}
+checksum=425e6882e1d558642bb5433c78155f6bee7c58c95083d3a6615cdf164365d719
 
 post_install() {
 	vinstall doc/mpdconf.example 644 etc mpd.conf
@@ -39,6 +35,51 @@ post_install() {
 		-i ${DESTDIR}/etc/mpd.conf
 }
 
+# Package build options
+build_options="jack lame mpcdec pulseaudio wavpack"
+desc_option_jack="Enable support for the JACK sound server"
+desc_option_lame="Enable support for the LAME encoder"
+desc_option_mpcdec="Enable support for the Musepack decoder"
+desc_option_pulseaudio="Enable support for the PulseAudio sound server"
+desc_option_wavpack="Enable support for the Wavpack decoder"
+
+build_options_default="pulseaudio"
+
+if [ "$build_option_jack" ]; then
+	configure_args+=" --enable-jack"
+	makedepends+=" jack-devel"
+else
+	configure_args+=" --disable-jack"
+fi
+
+if [ "$build_option_lame" ]; then
+	configure_args+=" --enable-lame-encoder"
+	makedepends+=" lame-devel"
+else
+	configure_args+=" --disable-lame-encoder"
+fi
+
+if [ "$build_option_mpcdec" ]; then
+	configure_args+=" --enable-mpc"
+	makedepends+=" libmpcdec-devel"
+else
+	configure_args+=" --disable-mpc"
+fi
+
+if [ "$build_option_pulseaudio" ]; then
+	configure_args+=" --enable-pulse"
+	makedepends+=" pulseaudio-devel"
+else
+	configure_args+=" --disable-pulse"
+fi
+
+if [ "$build_option_wavpack" ]; then
+	configure_args+=" --enable-wavpack"
+	makedepends+=" wavpack-devel"
+else
+	configure_args+=" --disable-wavpack"
+fi
+
 mpd_package() {
 	conf_files="/etc/mpd.conf"
 	system_accounts="mpd"