diff --git a/srcpkgs/xbmc/template b/srcpkgs/xbmc/template
index b903e7e940c..a58f9427b71 100644
--- a/srcpkgs/xbmc/template
+++ b/srcpkgs/xbmc/template
@@ -1,13 +1,13 @@
 # Template file for 'xbmc'
 pkgname=xbmc
 version=10.1
+revision=1
 distfiles="http://mirrors.xbmc.org/releases/source/xbmc-$version.tar.gz"
-build_style=gnu_configure
+build_style=custom-install
 short_desc="XBMC Media Center"
-configure_args="--disable-hal --disable-webserver --disable-debug
---disable-external-python --enable-goom --enable-mid LDFLAGS="
-make_install_target="prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr install"
 maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://www.xbmc.org"
+license="GPL-2"
 checksum=3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 long_desc="
  XBMC is an award-winning free and open source (GPL) software media player
@@ -117,16 +117,25 @@ Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
 Add_dependency full mesa-demos # required glxinfo
 
-pre_configure()
+do_build()
 {
 	export SVN_REV="-XBPS"
 	sed -i -e "/^AM_GNU_GETTEXT_VERSION.*$/d" lib/cpluff/configure.ac
 	sed -i -e 's:/usr/bin/lsb_release -d:/bin/true:' xbmc/utils/SystemInfo.cpp
+	# fix linking issue with gcc 4.5, see git 6ea61fce78q
+	sed -i 's: --soname,: -Wl,--soname,:' \
+		xbmc/cores/dvdplayer/Codecs/{,libdvd/}Makefile.in
 	./bootstrap
+	./configure --prefix=/usr --disable-hal --disable-webserver \
+		--disable-debug --disable-external-python --enable-goom \
+		--enable-mid LDFLAGS=
+	make ${makejobs}
 }
 
 post_install()
 {
+	make prefix=${DESTDIR} install
+
 	# Fix files containing invalid chars "&".
 	find ${DESTDIR} -type f | while read f; do
 		if $(echo "$f"|grep -q "&"); then