Index: head/devel/kcov/Makefile
===================================================================
--- head/devel/kcov/Makefile	(revision 477974)
+++ head/devel/kcov/Makefile	(revision 477975)
@@ -1,47 +1,45 @@
 # $FreeBSD$
 
 PORTNAME=	kcov
 DISTVERSIONPREFIX=	v
-DISTVERSION=	35-57
-DISTVERSIONSUFFIX=	-g69dfa9c
+DISTVERSION=	36
 CATEGORIES=	devel
 
 MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	Coverage checker for ELF, Bash, and Python programs
 
 LICENSE=	GPLv2 MIT # MIT for bundled handlebars, jquery, tablesorter
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_10= PR228478 devel/elfutils: undefined symbols on 10.4-RELEASE
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	ptrace code is only implemented for amd64
 
 BUILD_DEPENDS=	binutils>=2.30:devel/binutils
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libdw.so:devel/elfutils \
 		libelf.so:devel/elfutils
 
 USES=		cmake:outsource shebangfix python:build gettext-runtime
 
 # Remove -DPORTVERSION (and associated patch) when basing the port on an
 # official release
 CMAKE_ARGS=	-DKCOV_INSTALL_MANDIR=${PREFIX}/man -DPORTVERSION=${PORTVERSION}
 
 SHEBANG_GLOB=	*.py
 
-# Use a GitHub tag until version 36 gets released, whenever that might be
 USE_GITHUB=	yes
 GH_ACCOUNT=	SimonKagstrom
 
 PLIST_FILES=	bin/kcov \
 		man/man1/kcov.1.gz
 
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	COPYING.externals \
 		ChangeLog
 
 post-stage:
 	${RM} ${STAGEDIR}${DOCSDIR}/COPYING
 
 .include <bsd.port.mk>
Index: head/devel/kcov/distinfo
===================================================================
--- head/devel/kcov/distinfo	(revision 477974)
+++ head/devel/kcov/distinfo	(revision 477975)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526570477
-SHA256 (SimonKagstrom-kcov-v35-57-g69dfa9c_GH0.tar.gz) = 67772479b2cdc4bff42788306a786bbd0caf23fe25c67abeb6fa3c73bc66d653
-SIZE (SimonKagstrom-kcov-v35-57-g69dfa9c_GH0.tar.gz) = 301899
+TIMESTAMP = 1535123627
+SHA256 (SimonKagstrom-kcov-v36_GH0.tar.gz) = 29ccdde3bd44f14e0d7c88d709e1e5ff9b448e735538ae45ee08b73c19a2ea0b
+SIZE (SimonKagstrom-kcov-v36_GH0.tar.gz) = 302288