diff --git a/srcpkgs/xine-lib/template b/srcpkgs/xine-lib/template
index 4242c5053b6..fb28a57ae8d 100644
--- a/srcpkgs/xine-lib/template
+++ b/srcpkgs/xine-lib/template
@@ -1,10 +1,10 @@
 # Template file for 'xine-lib'
 pkgname=xine-lib
 version=1.2.8
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="
- --disable-vcd --disable-gnomevfs --without-esound --disable-dxr3 --disable-oss"
+configure_args="--disable-vcd --disable-gnomevfs --without-esound --disable-dxr3
+ --disable-oss --disable-optimizations"
 hostmakedepends="automake gettext-devel libtool pkg-config perl"
 makedepends="
  zlib-devel alsa-lib-devel libxcb-devel libSM-devel libXext-devel libXv-devel
@@ -12,7 +12,7 @@ makedepends="
  jack-devel samba-devel libflac-devel libmodplug-devel libmpcdec-devel
  speex-devel libtheora-devel libvorbis-devel libdca-devel faad2-devel
  libcdio-devel libbluray-devel aalib-devel libcaca-devel libXinerama-devel
- libjpeg-turbo-devel libmng-devel"
+ libjpeg-turbo-devel libmng-devel libdvdnav-devel"
 short_desc="A multimedia playback engine"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2, LGPL-2.1"
@@ -20,9 +20,9 @@ homepage="http://www.xine-project.org"
 distfiles="${SOURCEFORGE_SITE}/xine/$pkgname-$version.tar.xz"
 checksum=f1b299a71dcae075bf6792e7b5a2020ed5ac8c46ad5091e004ce266aac40e8a6
 
-if [ "$XBPS_TARGET_MACHINE" = "i686" -o "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-	makedepends+=" libva-glx-devel libvdpau-devel glu-devel"
-fi
+case "$XBPS_TARGET_MACHINE" in
+	i686*|x86_64*) makedepends+=" libva-glx-devel libvdpau-devel glu-devel";;
+esac
 
 libxine_package() {
 	short_desc+=" - runtime library"