diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index e36fa648958..cc37edd8e8d 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,8 +1,7 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
 version=0.17.1
-revision=2
-wrksrc="${pkgname}-${version}"
+revision=3
 build_style=gnu-configure
 configure_args="--with-incompatible-bdb --disable-ccache --disable-static
  --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -13,34 +12,29 @@ short_desc="Bitcoin is a peer-to-peer network based digital currency"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="MIT"
 homepage="https://bitcoin.org/"
-distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
-checksum=3e564fb5cf832f39e930e19c83ea53e09cfe6f93a663294ed83a32e194bda42a
+distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz
+ https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop
+ https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png"
+checksum="3e564fb5cf832f39e930e19c83ea53e09cfe6f93a663294ed83a32e194bda42a
+ 0a46bbadda140599e807be38999e6848c89f9c3523d26fede02d34d62d50f632
+ ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722"
 conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
+skip_extraction="bitcoin-qt.desktop bitcoin128.png"
+subpackages="bitcoin-devel"
 
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX -qt subpkg
 	makedepends+=" qt5-devel qt5-tools-devel"
 	configure_args+=" --with-gui"
+	subpackages+=" bitcoin-qt"
 fi
 
-pre_configure() {
-	extra_files="
-		https://raw.github.com/bitcoin-core/packaging/master/debian/bitcoin-qt.desktop
-		https://raw.github.com/bitcoin/bitcoin/v${version}/share/pixmaps/bitcoin128.png
-		https://raw.github.com/bitcoin-core/packaging/master/debian/examples/bitcoin.conf"
-	for f in ${extra_files}; do
-		$XBPS_FETCH_CMD $f
-	done
-}
-
-
 post_install() {
-	rm "${DESTDIR}"/usr/bin/test_bitcoin
-	rm "${DESTDIR}"/usr/bin/bench_bitcoin
+	rm "${DESTDIR}"/usr/bin/{test,bench}_bitcoin
 
-	if [ -z "$CROSS_BUILD" ]; then
-		rm "${DESTDIR}"/usr/bin/test_bitcoin-qt
-	fi
+	for b in bitcoind bitcoin-cli bitcoin-tx; do
+		vinstall contrib/${b}.bash-completion 644 usr/share/bash-completion $b
+	done
 
 	vlicense COPYING
 }
@@ -56,18 +50,15 @@ bitcoin-devel_package() {
 	}
 }
 
-if [ -z "$CROSS_BUILD" ]; then
-
 bitcoin-qt_package() {
 	depends="desktop-file-utils"
 	short_desc+=" - QT GUI"
 	pkg_install() {
 		vmove usr/bin/bitcoin-qt
 		vmove usr/share/man/man1/bitcoin-qt.1
-		vinstall bitcoin-qt.desktop 644 usr/share/applications
-		vinstall bitcoin128.png 644 usr/share/pixmaps
+		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin-qt.desktop 644 usr/share/applications
+		vinstall ${XBPS_SRCDISTDIR}/${sourcepkg}-${version}/bitcoin128.png 644 usr/share/pixmaps
 		vlicense COPYING
+		rm "${DESTDIR}"/usr/bin/test_bitcoin-qt
 	}
 }
-
-fi # !CROSS_BUILD