diff --git a/community/rusxmms/PKGBUILD b/community/rusxmms/PKGBUILD
index 84bb11d81..7f750baf0 100644
--- a/community/rusxmms/PKGBUILD
+++ b/community/rusxmms/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 14511 2010-04-04 18:33:41Z spupykin $
+# $Id: PKGBUILD 54066 2011-08-13 05:45:42Z ebelanger $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 # ALARM: Kevin Mihelich <kevin@plugapps.com>
 #  - updated RusXMMS2 download location
-#  - replaced i686 with arm in the case statement
+#  - replaced x86 with arm/armv7h in the case statement
 
 plugrel=1
 
@@ -12,36 +12,44 @@ pkgname=rusxmms
 pkgver=1.2.11_csa43
 _xmmsver=1.2.11
 _csaver=csa43
-pkgrel=2
+pkgrel=3
 pkgdesc="XMMS with librcc"
 arch=(i686 x86_64)
 license=(GPL)
 url="http://rusxmms.sourceforge.net/"
-depends=(libsm libxxf86vm zlib gtk libvorbis esd alsa-lib libgl librcc librcd openssl)
+depends=(libsm libxxf86vm zlib gtk libvorbis alsa-lib libgl librcc librcd openssl)
 makedepends=(mesa patch)
 provides=(xmms)
 conflicts=(xmms)
 options=('!libtool' '!distcc')
 source=(http://xmms.org/files/1.2.x/xmms-${_xmmsver}.tar.bz2 \
-        http://downloads.sourceforge.net/project/rusxmms/rusxmms2/csa43/RusXMMS2-${_csaver}.tar.bz2)
+	http://dside.dyndns.org/files/rusxmms/RusXMMS2-${_csaver}.tar.bz2)
 md5sums=('f3e6dbaf0b3f571a532ab575656be506'
          '8f387dd2e5c95f8730979e09687b6e02')
 
 build() {
-  cd ${startdir}/src/xmms-${_xmmsver}
+  cd "${srcdir}"/xmms-${_xmmsver}
 
 if true; then
-  ln -s $srcdir/RusXMMS2 $srcdir/xmms-${_xmmsver}/RusXMMS2
-  (cd $srcdir/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh) || return 1
+  ln -s "$srcdir"/RusXMMS2 "$srcdir"/xmms-${_xmmsver}/RusXMMS2
+  (cd "$srcdir"/xmms-${_xmmsver}/RusXMMS2 && ./apply.sh)
 
-  mv $srcdir/RusXMMS2/source/* $srcdir/xmms-${_xmmsver}/libxmms/ && \
-#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' $srcdir/xmms-${_xmmsver}/libxmms/Makefile.am && \
-  aclocal && automake && autoconf || return 1
-  (cd libxmms && aclocal && automake && autoconf) || return 1
+  mv "$srcdir"/RusXMMS2/source/* "$srcdir"/xmms-${_xmmsver}/libxmms/
+#  sed -i 's#charset.c charset.h#charset.c charset.h rcc.h rcc.c rcc_lang.h#g' "$srcdir"/xmms-${_xmmsver}/libxmms/Makefile.am && \
+
+# I already remove esound from repo and it has some autotools errors that I can't seem to figure out. So let's use a hack to get the esound removal rebuild done.
+#  aclocal
+# automake
+autoconf
+  sed -i 's/unicode.c//g' Input/mpg123/Makefile.in
+  sed -i 's/unicode.lo//g' Input/mpg123/Makefile.in
+
+
+  (cd libxmms && aclocal && automake && autoconf)
 
   case $CARCH in
-    x86_64)
-        ./configure --prefix=/usr --disable-mikmod --disable-simd
+    armv7h)
+        ./configure --prefix=/usr --disable-mikmod --disable-simd --disable-vorbis --disable-vorbistest
 	;;
     arm)
         ./configure --prefix=/usr --disable-mikmod --enable-simd --disable-vorbis --disable-vorbistest
@@ -52,13 +60,17 @@ if true; then
   esac
 fi
 
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-
-  mkdir -p ${startdir}/pkg/usr/share/{applications,pixmaps}
-  install -m 644 xmms/xmms.desktop ${startdir}/pkg/usr/share/applications && \
-  install -m 644 xmms/xmms_mini.xpm ${startdir}/pkg/usr/share/pixmaps/xmms.xpm || return 1
-  # don't want wmxmms
-  rm -rf $startdir/pkg/usr/bin/wmxmms $startdir/pkg/usr/share/xmms && \
-  rm -f $startdir/pkg/usr/man/man1/{gnomexmms.1,wmxmms.1}
+  make
+}
+
+package(){
+  cd "${srcdir}"/xmms-${_xmmsver}
+  make DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir"/usr/share/{applications,pixmaps}
+  install -m 644 xmms/xmms.desktop "$pkgdir"/usr/share/applications
+  install -m 644 xmms/xmms_mini.xpm "$pkgdir"/usr/share/pixmaps/xmms.xpm
+  # don't want wmxmms
+  rm -rf "$pkgdir"/usr/bin/wmxmms "$pkgdir"/usr/share/xmms
+  rm -f "$pkgdir"/usr/share/man/man1/{gnomexmms.1,wmxmms.1}
 }