diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile
index 71856699dda9..9a1475eb49e9 100644
--- a/net-p2p/bitcoin/Makefile
+++ b/net-p2p/bitcoin/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	bitcoin
-PORTVERSION=	0.16.1
-DISTVERSIONPREFIX=	v
-PORTREVISION?=	1
+PORTVERSION=	0.16.2
+PORTREVISION?=	0
 CATEGORIES=	net-p2p finance
+MASTER_SITES=	https://bitcoincore.org/bin/bitcoin-core-${PORTVERSION}/
 
 MAINTAINER=	kbowling@FreeBSD.org
 COMMENT?=	Virtual Peer-to-Peer Currency Client (QT)
@@ -18,7 +18,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 +118,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} ${FILESDIR}/bitcoin128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .endif
diff --git a/net-p2p/bitcoin/distinfo b/net-p2p/bitcoin/distinfo
index b31abc7cb426..65cf19504fa6 100644
--- a/net-p2p/bitcoin/distinfo
+++ b/net-p2p/bitcoin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1529269970
-SHA256 (bitcoin-bitcoin-v0.16.1_GH0.tar.gz) = c0065f63509c1ca8b45057b415f8e4cbaf0f234def6090511d68fd3df3a56380
-SIZE (bitcoin-bitcoin-v0.16.1_GH0.tar.gz) = 6655512
+TIMESTAMP = 1533629644
+SHA256 (bitcoin-0.16.2.tar.gz) = 1910c58b7d8e13acbd05b0e8fd9b4b61cbac5776f058ee10bc80c1d2a7c707d8
+SIZE (bitcoin-0.16.2.tar.gz) = 7019310
diff --git a/net-p2p/bitcoin/files/bitcoin-qt.desktop b/net-p2p/bitcoin/files/bitcoin-qt.desktop
new file mode 100644
index 000000000000..204cdf99d056
--- /dev/null
+++ b/net-p2p/bitcoin/files/bitcoin-qt.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Name=Bitcoin Core
+Comment=Connect to the Bitcoin P2P Network
+Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
+Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
+Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
+Exec=bitcoin-qt %u
+Terminal=false
+Type=Application
+Icon=bitcoin128
+MimeType=x-scheme-handler/bitcoin;
+Categories=Office;Finance;
+StartupWMClass=Bitcoin-qt