diff --git a/common/shlibs b/common/shlibs
index f8c63d69d4c..d345fb5587b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2005,7 +2005,6 @@ libcvm-v2client.so.1 cvm-0.97_1
 libudns.so.0 udns-0.4_1
 libcriu.so.1 criu-1.5.1_2
 libwebsockets.so.12 libwebsockets-2.4.0_1
-libbitcoinconsensus.so.0 litecoin-0.10.1.2_1
 libnfc.so.0 libnfc-1.7.1_1
 libfuzzy.so.2 libfuzzy-2.12_1
 libSDL_gfx.so.15 SDL_gfx-2.0.25_2
diff --git a/srcpkgs/bitcoin-devel b/srcpkgs/bitcoin-devel
new file mode 120000
index 00000000000..f3c13956326
--- /dev/null
+++ b/srcpkgs/bitcoin-devel
@@ -0,0 +1 @@
+bitcoin
\ No newline at end of file
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index cba03b3ebe4..22298992f43 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,8 +1,9 @@
 # Template file for 'bitcoin'
 pkgname=bitcoin
-version=0.15.0.1
+version=0.15.1
 revision=1
-create_wrksrc=yes
+build_style=gnu-configure
+configure_args="--with-incompatible-bdb --disable-ccache --disable-static --enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr"
 hostmakedepends="pkg-config yasm"
 makedepends="db-devel protobuf-devel boost-devel miniupnpc-devel libevent-devel qrencode-devel"
 short_desc="Bitcoin is a peer-to-peer network based digital currency"
@@ -10,7 +11,8 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="MIT"
 homepage="https://bitcoin.org/"
 distfiles="https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
-checksum=b57e9e756018e4082f5557a4216195b0cd197c5a62473b6fe0509a0aa71e519b
+checksum=34de2dbe058c1f8b6464494468ebe2ff0422614203d292da1c6458d6f87342b4
+conflicts="litecoin>=0" # Both provide libbitcoinconsensus.so.0
 
 if [ -z "$CROSS_BUILD" ]; then
 	# XXX -qt subpkg
@@ -28,27 +30,31 @@ pre_configure() {
 		$XBPS_FETCH_CMD $f
 	done
 }
-do_configure() {
-	cd ${pkgname}-${version%.*}
 
-	./configure ${configure_args} \
-		--with-incompatible-bdb \
-		--disable-ccache \
-		--disable-static \
-		--enable-hardening \
-		--with-boost=${XBPS_CROSS_BASE}/usr
+do_check() {
+	make check
 }
-do_build() {
-	cd ${pkgname}-${version%.*}
-	make ${makejobs}
+
+post_install() {
+	rm "${DESTDIR}"/usr/bin/test_bitcoin
+	rm "${DESTDIR}"/usr/bin/bench_bitcoin
+
+	if [ -z "$CROSS_BUILD" ]; then
+		rm "${DESTDIR}"/usr/bin/test_bitcoin-qt
+	fi
+
+	vlicense COPYING
 }
-do_install() {
-	vbin ${pkgname}-${version%.*}/src/bitcoin-cli
-	vbin ${pkgname}-${version%.*}/src/bitcoind
-	vbin ${pkgname}-${version%.*}/src/bitcoin-tx
-	vsconf bitcoin.conf
-	vman bitcoind.1
-	vlicense ${pkgname}-${version%.*}/COPYING
+
+bitcoin-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vdoc doc/shared-libraries.md # Provides information on libbitcoinconsensus
+	}
 }
 
 if [ -z "$CROSS_BUILD" ]; then
@@ -57,9 +63,11 @@ bitcoin-qt_package() {
 	depends="desktop-file-utils"
 	short_desc+=" - QT GUI"
 	pkg_install() {
-		vbin ${wrksrc}/${sourcepkg}-${version%.*}/src/qt/bitcoin-qt
-		vinstall ${wrksrc}/bitcoin-qt.desktop 644 usr/share/applications
-		vinstall ${wrksrc}/bitcoin128.png 644 usr/share/pixmaps
+		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
+		vlicense COPYING
 	}
 }