Index: head/comms/gr-osmosdr/Makefile
===================================================================
--- head/comms/gr-osmosdr/Makefile	(revision 473721)
+++ head/comms/gr-osmosdr/Makefile	(revision 473722)
@@ -1,48 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	gr-osmosdr
-PORTVERSION=	20170612
-PORTREVISION=	2
+PORTVERSION=	20180610
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
-		LOCAL/martymac
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	GNU Radio OsmoSDR module
 
 LICENSE=	GPLv3
 
 BUILD_DEPENDS=	swig3.0:devel/swig30 \
 		cheetah:devel/py-cheetah
 LIB_DEPENDS=	libgnuradio-runtime.so:comms/gnuradio \
 		libgnuradio-pmt.so:comms/gnuradio \
 		libgnuradio-blocks.so:comms/gnuradio \
 		libboost_system.so:devel/boost-libs \
 		libboost_thread.so:devel/boost-libs
 
 USES=	cmake compiler:c++11-lang fortran pkgconfig python:2.7 tar:tgz
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	osmocom
+GH_TAGNAME=	c98be5d
+
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	swig=swig3.0
 
 # See lib/CMakeLists.txt to enable more components
 CMAKE_ARGS+=	-DENABLE_DEFAULT:BOOL=OFF \
 		-DENABLE_FCD:BOOL=ON \
 		-DENABLE_FILE:BOOL=ON \
 		-DENABLE_PYTHON=ON \
 		-DPYTHON_EXECUTABLE:STRING="${PYTHON_CMD}"
 
 CXXFLAGS+=	-std=c++11
 
 OPTIONS_DEFINE=	RTLSDR HACKRF
 RTLSDR_DESC=	Enable rtl-sdr (RTL2832) support
 OPTIONS_DEFAULT=	RTLSDR
 RTLSDR_LIB_DEPENDS=	librtlsdr.so:comms/rtl-sdr
 RTLSDR_CMAKE_ON=	-DENABLE_RTL:BOOL=ON -DENABLE_RTL_TCP:BOOL=ON
 HACKRF_DESC=	Enable hackrf one hardware support
 HACKRF_LIB_DEPENDS=	libhackrf.so:comms/hackrf
 HACKRF_CMAKE_ON=	-DENABLE_HACKRF:BOOL=ON
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgnuradio-osmosdr.so.0.1.5git
 
 .include <bsd.port.mk>
Index: head/comms/gr-osmosdr/distinfo
===================================================================
--- head/comms/gr-osmosdr/distinfo	(revision 473721)
+++ head/comms/gr-osmosdr/distinfo	(revision 473722)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515789528
-SHA256 (gr-osmosdr-20170612.tgz) = c3427f73a85f67f1070cbc9e0091d204f89989bd766d0df13d0b528deb8c8e8f
-SIZE (gr-osmosdr-20170612.tgz) = 275296
+TIMESTAMP = 1529941977
+SHA256 (osmocom-gr-osmosdr-20180610-c98be5d_GH0.tar.gz) = ee6febaf453aab4332218a4852ff66c2045a62d64edb20f57676536b7e0c95f3
+SIZE (osmocom-gr-osmosdr-20180610-c98be5d_GH0.tar.gz) = 272086