diff --git net-p2p/bitcoin/Makefile net-p2p/bitcoin/Makefile
index 1ab02e433f7a..67b55648a765 100644
--- net-p2p/bitcoin/Makefile
+++ net-p2p/bitcoin/Makefile
@@ -2,10 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.16.1
-DISTVERSIONPREFIX=	v
-PORTREVISION?=	2
+PORTVERSION=	0.16.2
+PORTREVISION?=	0
 CATEGORIES=	net-p2p finance
+MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/:DEFAULT \
+		LOCAL/swills:icon
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} bitcoin128.png:icon
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${_DISTFILES:N*.png}
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
@@ -18,7 +22,6 @@ LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 BROKEN_powerpc64=	fails to compile: util.cpp: undefined reference to boost::program_options::to_internal
 
 USES=		autoreconf compiler:c++11-lib gmake libtool pkgconfig qt:5 shebangfix ssl
-USE_GITHUB=	yes
 GNU_CONFIGURE=	yes
 
 SLAVE_PORT?=	no
@@ -119,11 +122,9 @@ CONFIGURE_ARGS+=--disable-asm
 .if defined(SLAVE_PORT) && ${SLAVE_PORT} == "no"
 
 post-install:
-	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \
-		${WRKSRC}/contrib/debian/bitcoin-qt.desktop
-	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop \
+	${INSTALL} ${FILESDIR}/bitcoin-qt.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
-	${INSTALL} ${WRKSRC}/share/pixmaps/bitcoin128.png \
+	${INSTALL} ${DISTDIR}/${DIST_SUBDIR}/bitcoin128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .endif
diff --git net-p2p/bitcoin/distinfo net-p2p/bitcoin/distinfo
index b31abc7cb426..fc797ebf666f 100644
--- net-p2p/bitcoin/distinfo
+++ net-p2p/bitcoin/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1529269970
-SHA256 (bitcoin-bitcoin-v0.16.1_GH0.tar.gz) = c0065f63509c1ca8b45057b415f8e4cbaf0f234def6090511d68fd3df3a56380
-SIZE (bitcoin-bitcoin-v0.16.1_GH0.tar.gz) = 6655512
+TIMESTAMP = 1534797874
+SHA256 (bitcoin/bitcoin-0.16.2.tar.gz) = 1910c58b7d8e13acbd05b0e8fd9b4b61cbac5776f058ee10bc80c1d2a7c707d8
+SIZE (bitcoin/bitcoin-0.16.2.tar.gz) = 7019310
+SHA256 (bitcoin/bitcoin128.png) = ad880c8459ecfdb96abe6a4689af06bdd27906e0edcd39d0915482f2da91e722
+SIZE (bitcoin/bitcoin128.png) = 10639