diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 520554b4cb6..0c9ef51122a 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,52 +1,62 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.8.6
+version=0.9.2
 revision=1
-wrksrc="${pkgname}-${version}-linux"
-hostmakedepends="which"
-makedepends="db-devel>=5.3 openssl-devel boost-devel>=1.54 miniupnpc-devel"
+create_wrksrc=yes
+hostmakedepends="which pkg-config"
+makedepends="db-devel protobuf-devel openssl-devel boost-devel>=1.54 miniupnpc-devel"
 short_desc="Bitcoin is a peer-to-peer network based digital currency"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="MIT"
 homepage="http://www.bitcoin.org/"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-linux.tar.gz"
-checksum=73495de53d1a30676884961e39ff46c3851ff770eeaa767331d065ff0ce8dd0c
+distfiles="http://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz"
+checksum=58a77aeb4c81b54d3903d85abce4f0fb580694a3611a415c5fe69a27dea5935b
 
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX -qt subpkg
 	hostmakedepends+=" automoc4"
 	makedepends+=" qt-devel"
+	configure_args+=" --with-gui=qt4"
 fi
 
-do_build() {
-	cd src
-	if [ -z "$CROSS_BUILD" ]; then
-		# qt gui
-		qmake
-		# XXX wtf??? leveldb inherits this value and errors out
-		sed -e "s|ar cqs|ar|g" -i Makefile
-		make
-	fi
-	# daemon
-	make -f makefile.unix -C src CXXFLAGS="$CXXFLAGS -w" USE_UPNP=1
+pre_configure() {
+	extra_files="
+		https://raw.github.com/bitcoin/bitcoin/v${version}/contrib/debian/bitcoin-qt.desktop
+		https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png
+		https://raw.github.com/bitcoin/bitcoin/v${version}/contrib/debian/examples/bitcoin.conf
+		https://raw.github.com/bitcoin/bitcoin/v${version}/contrib/debian/manpages/bitcoind.1
+		https://raw.github.com/bitcoin/bitcoin/v${version}/contrib/debian/manpages/bitcoin.conf.5"
+	for f in ${extra_files}; do
+		$XBPS_FETCH_CMD $f
+	done
+	tar xf ${pkgname}-${version}-linux/src/${pkgname}-${version}.tar.gz -C ${wrksrc}
+}
+do_configure() {
+	cd ${pkgname}-${version}
+	./configure ${configure_args} --with-incompatible-bdb --with-boost=${XBPS_CROSS_BASE}/usr
+}
+do_build() {
+	cd ${pkgname}-${version}
+	make ${makejobs}
 }
-
 do_install() {
-	vinstall src/src/bitcoind 755 usr/bin
-	vinstall src/contrib/debian/examples/bitcoin.conf 644 usr/share/examples/$pkgname
-	vinstall src/contrib/debian/manpages/bitcoind.1 644 usr/share/man/man1
-	vinstall src/contrib/debian/manpages/bitcoin.conf.5 644 usr/share/man/man5
-	vinstall COPYING 644 usr/share/licenses/$pkgname
+	vinstall ${pkgname}-${version}/src/bitcoind 755 usr/bin
+	vinstall bitcoin.conf 644 usr/share/examples/$pkgname
+	vinstall bitcoind.1 644 usr/share/man/man1
+	vinstall bitcoin.conf.5 644 usr/share/man/man5
+	vinstall ${pkgname}-${version}/COPYING 644 usr/share/licenses/$pkgname
 }
 
 if [ -z "$CROSS_BUILD" ]; then
-	bitcoin-qt_package() {
-		depends="desktop-file-utils"
-		short_desc+=" - QT GUI"
-		pkg_install() {
-			vinstall ${wrksrc}/src/bitcoin-qt 755 usr/bin
-			vinstall ${wrksrc}/src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
-			vinstall ${wrksrc}/src/share/pixmaps/bitcoin64.xpm 644 usr/share/pixmaps
-		}
+
+bitcoin-qt_package() {
+	depends="desktop-file-utils"
+	short_desc+=" - QT GUI"
+	pkg_install() {
+		vinstall ${wrksrc}/${sourcepkg}-${version}/src/qt/bitcoin-qt 755 usr/bin
+		vinstall ${wrksrc}/bitcoin-qt.desktop 644 usr/share/applications
+		vinstall ${wrksrc}/bitcoin128.png 644 usr/share/pixmaps
 	}
+}
+
 fi # !CROSS_BUILD