diff --git a/textproc/py-feedparser/Makefile b/textproc/py-feedparser/Makefile
index acf92a2f3..2dcccc67e 100644
--- a/textproc/py-feedparser/Makefile
+++ b/textproc/py-feedparser/Makefile
@@ -1,31 +1,43 @@
 # Created by: ijliao
 
 PORTNAME=	feedparser
-PORTVERSION=	5.2.1
+PORTVERSION=	6.0.2
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Universal feed parser written in Python
 
-LICENSE=	BSD2CLAUSE
+LICENSE=	BSD2CLAUSE PSFL
+LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+ tar:bzip2
 USE_PYTHON=	distutils autoplist
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	kurtmckee
 
 NO_ARCH=	yes
 
+PORTDOCS=	NEWS README.rst
+
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	NEWS README.rst
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} > 3700
+PLIST_FILES+=	${PYTHON_SITELIBDIR}/sgmllib.py
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/sgmllib.py ${STAGEDIR}/${PYTHON_SITELIBDIR}/sgmllib.py
+.endif
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 do-test:
-	@(cd ${WRKSRC}/${PORTNAME}; ${PYTHON_CMD} ${PORTNAME}test.py)
+	@(cd ${WRKSRC}; ${PYTHON_CMD} tests/runtests.py)
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/py-feedparser/distinfo b/textproc/py-feedparser/distinfo
index 740e0aeea..a11a6b96d 100644
--- a/textproc/py-feedparser/distinfo
+++ b/textproc/py-feedparser/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464128973
-SHA256 (feedparser-5.2.1.tar.bz2) = ce875495c90ebd74b179855449040003a1beb40cd13d5f037a0654251e260b02
-SIZE (feedparser-5.2.1.tar.bz2) = 192328
+TIMESTAMP = 1618343573
+SHA256 (kurtmckee-feedparser-6.0.2_GH0.tar.gz) = b211cfb80c4daefca64b773ade77340727187564fad9c2c94b37da8e1f03788f
+SIZE (kurtmckee-feedparser-6.0.2_GH0.tar.gz) = 251508