diff --git a/misc/pciids/Makefile b/misc/pciids/Makefile
index 0f67003c471d..8274425f02df 100644
--- a/misc/pciids/Makefile
+++ b/misc/pciids/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	pciids
 PORTVERSION=	20160227
 CATEGORIES=	misc
-MASTER_SITES=	LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Database of all known IDs used in PCI devices
@@ -18,36 +17,12 @@ USES=		tar:xz
 
 PLIST_FILES=	%%DATADIR%%/pci.ids
 
+GH_ACCOUNT=	pciutils
+GH_TAGNAME=	c83ceba
+USE_GITHUB=	yes
+
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/pci.ids ${STAGEDIR}${DATADIR}/
 
-# maintainer section:
-
-MS_DIFF=	${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.diff
-MS_DISTFILES=	pci.ids
-MS_MASTER_SITE=	http://pci-ids.ucw.cz/
-MS_VERSION=	`${CAT} ${MS_VERSIONFILE}`
-MS_VERSIONFILE=	${MS_WRKSRC}/.version
-MS_WRKSRC=	${WRKSRC}/tmp
-
-maketar: do-clean extract
-	@${MKDIR} ${MS_WRKSRC}/
-	@${FETCH_CMD} -o ${MS_WRKSRC}/${MS_DISTFILES} ${MS_MASTER_SITE}${MS_DISTFILES}
-	@${AWK} '/^#	Version/ { gsub(/\./, "", $$3); print $$3 }' ${MS_WRKSRC}/${MS_DISTFILES} > ${MS_VERSIONFILE}
-	@${MKDIR} ${MS_WRKSRC}/${PORTNAME}-${PORTVERSION}/ ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}/
-	@${MV} ${MS_WRKSRC}/${MS_DISTFILES} ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}/
-	@${CP} ${WRKSRC}/${MS_DISTFILES} ${MS_WRKSRC}/${PORTNAME}-${PORTVERSION}/${MS_DISTFILES}
-	-@cd ${MS_WRKSRC}/ && ${DIFF} -u ${PORTNAME}-${PORTVERSION}/${MS_DISTFILES} ${PORTNAME}-${MS_VERSION}/${MS_DISTFILES} > ${MS_DIFF}
-	@if [ -s ${MS_DIFF} ]; then \
-		${CP} -i ${MS_DIFF} ${.CURDIR}/; \
-		cd ${MS_WRKSRC}/ && ${TAR} -Jcf ${PORTNAME}-${MS_VERSION}.tar.xz ${PORTNAME}-${MS_VERSION}/; \
-		sudo ${INSTALL} -m 644 ${MS_WRKSRC}/${PORTNAME}-${MS_VERSION}.tar.xz ${DISTDIR}/; \
-		${SED} -i '' -e '/^PORTVERSION=/ s|${PORTVERSION}|'${MS_VERSION}'|; /^PORTREVISION=/d' ${.CURDIR}/Makefile; \
-		cd ${.CURDIR}/ && ${MAKE_CMD} makesum; \
-		${ECHO_MSG} "*** Update from ${PORTVERSION} to ${MS_VERSION}, diff: ${.CURDIR}/${PORTNAME}-${MS_VERSION}.diff ***"; \
-	else \
-		${ECHO_MSG} "*** ${MS_MASTER_SITE}${MS_DISTFILES} is unchanged (${PORTVERSION}) ***"; \
-	fi
-
 .include <bsd.port.mk>
diff --git a/misc/pciids/distinfo b/misc/pciids/distinfo
index 7fa1b93e9fce..5f951c3b28dc 100644
--- a/misc/pciids/distinfo
+++ b/misc/pciids/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pciids-20160227.tar.xz) = 39ea030c37589345b37646c6936576a20b6dcc730df9beab69fded3cf80ad7fa
-SIZE (pciids-20160227.tar.xz) = 182244
+SHA256 (pciutils-pciids-20160227-c83ceba_GH0.tar.gz) = facd20deb0331c955b3147ce0a7efb132873f892a4d010922e72e40252a60eda
+SIZE (pciutils-pciids-20160227-c83ceba_GH0.tar.gz) = 241279