diff --git a/srcpkgs/bitcoin/bitcoin-qt.template b/srcpkgs/bitcoin/bitcoin-qt.template
index a00fe521de9..6fbc750a16c 100644
--- a/srcpkgs/bitcoin/bitcoin-qt.template
+++ b/srcpkgs/bitcoin/bitcoin-qt.template
@@ -7,7 +7,7 @@ long_desc="${long_desc}
  This package contains the QT GUI."
 
 do_install() {
-	vinstall bitcoin-qt 755 usr/bin
-	vinstall contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
-	vinstall share/pixmaps/bitcoin80.xpm 644 usr/share/pixmaps
+	vinstall src/bitcoin-qt 755 usr/bin
+	vinstall src/contrib/debian/bitcoin-qt.desktop 644 usr/share/applications
+	vinstall src/share/pixmaps/bitcoin80.xpm 644 usr/share/pixmaps
 }
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index 083cdd37c62..403129fe163 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,16 +1,16 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.6.3
+version=0.7.0
 revision=1
-wrksrc="bitcoin-bitcoin-bbe1084"
+wrksrc="${pkgname}-${version}-linux"
 subpackages="bitcoin-qt"
 makedepends="which qt-devel boost-devel automoc4 miniupnpc-devel"
 short_desc="Bitcoin is a peer-to-peer network based digital currency"
 maintainer="Juan RP <xtraeme@gmail.com>"
-license="GPL-3"
+license="MIT"
 homepage="http://www.bitcoin.org/"
-distfiles="http://xbps.nopcode.org/distfiles/$pkgname-$version.tar.gz"
-checksum=3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-linux.tar.gz"
+checksum=4b7a44fec28cbd9194a1303dd65bba8f13aa2facd4e06e4a3d1df6d66bc1deb5
 long_desc="
  Bitcoin is an experimental new digital currency that enables instant payments
  to anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to
@@ -19,6 +19,7 @@ long_desc="
  source software which enables the use of this currency."
 
 do_build() {
+	cd src
 	# qt gui
 	qmake && make ${makejobs}
 	# daemon
@@ -26,9 +27,9 @@ do_build() {
 }
 
 do_install() {
-	vinstall src/bitcoind 755 usr/bin
-	vinstall contrib/debian/examples/bitcoin.conf 644 usr/share/examples/$pkgname
-	vinstall contrib/debian/manpages/bitcoind.1 644 usr/share/man/man1
-	vinstall contrib/debian/manpages/bitcoin.conf.5 644 usr/share/man/man5
+	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
 }