diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index b1b77d6d1..c417e24ce 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=xmms
 pkgver=1.2.11
-pkgrel=6
+pkgrel=7
 pkgdesc="The X MultiMedia System - a multimedia player"
 arch=('i686' 'x86_64')
 url="http://legacy.xmms2.org/"
@@ -17,7 +17,6 @@ optdepends=('libmikmod: for the MikMod input plugin' \
             'libvorbis: for the Ogg Vorbis input plugin' \
             'alsa-lib: for the alsa output plugin' \
             'libgl: for the OpenGL Spectrum analyser visualization plugin')
-options=('!libtool')
 install=xmms.install
 source=(http://legacy.xmms2.org/${pkgname}-${pkgver}.tar.bz2 \
 	xmms-menu.patch xmms-1.2.10-crossfade-0.3.9.patch xmms-fix.diff \
@@ -38,9 +37,8 @@ sha1sums=('9d1eae4baab25fd35c9ddfb49321ca60222f672d'
           'f24071ae484d9b55e61dba076801fa8e7976ff2f'
           '485c67cb8c8d4678bb3b0b280d2e233b14153b22')
 
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
+prepare() {
+  cd ${pkgname}-${pkgver}
 # Fix xmms.desktop
   patch -p0 < ../xmms-menu.patch
 # Patch for hang with xmms-crossfade 
@@ -54,7 +52,10 @@ build() {
   patch -p1 < ../xmms-1.2.10-fonts.patch
   patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch
   patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch
+}
 
+build() {
+  cd ${pkgname}-${pkgver}
   if [ "$CARCH" == "x86_64" ]; then
      SIMDOPT="--disable-simd"
   elif [ "$CARCH" == "i686" ]; then
@@ -67,7 +68,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 xmms/xmms.desktop "${pkgdir}/usr/share/applications/xmms.desktop"