diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index 8a500cb4ae52..81c51913999a 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1000 2020/08/01 08:18:48 kmos Exp $
+# $OpenBSD: Makefile,v 1.1001 2020/08/01 19:07:19 bket Exp $
 
 COMMENT =	exceptions to pkg_add rules
 CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-3.392
+PKGNAME =	quirks-3.393
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index b939b97eb618..08d0321e864a 100644
--- a/devel/quirks/files/Quirks.pm
+++ b/devel/quirks/files/Quirks.pm
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: Quirks.pm,v 1.1018 2020/08/01 08:18:48 kmos Exp $
+# $OpenBSD: Quirks.pm,v 1.1019 2020/08/01 19:07:19 bket Exp $
 #
 # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
 #
@@ -450,6 +450,7 @@ my $stem_extensions = {
 	'py-rarfile' => 'py3-rarfile',
 	'py-pygfm' => 'py3-pygfm',
 	'py-humanize' => 'py3-humanize',
+	'py-sabyenc' => 'py3-sabyenc',
 };
 
 my $obsolete_reason = {
diff --git a/news/Makefile b/news/Makefile
index fdfc838ce24b..a62ec3fe6724 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2019/02/27 04:29:22 bket Exp $
+# $OpenBSD: Makefile,v 1.34 2020/08/01 19:07:19 bket Exp $
 
      SUBDIR =
      SUBDIR += aub
@@ -10,7 +10,7 @@
      SUBDIR += p5-News-Article
      SUBDIR += p5-News-Newsrc
      SUBDIR += pan
-     SUBDIR += py-sabyenc
+     SUBDIR += py-sabyenc,python3
      SUBDIR += py-yenc
      SUBDIR += sabnzbd
      SUBDIR += slrn
diff --git a/news/py-sabyenc/Makefile b/news/py-sabyenc/Makefile
index 234e79dc726a..27a1cbf11fb3 100644
--- a/news/py-sabyenc/Makefile
+++ b/news/py-sabyenc/Makefile
@@ -1,14 +1,16 @@
-# $OpenBSD: Makefile,v 1.2 2019/07/02 04:19:32 bket Exp $
+# $OpenBSD: Makefile,v 1.3 2020/08/01 19:07:19 bket Exp $
 
 COMMENT =		yEnc Module for Python modified for SABnzbd
 
-MODPY_EGG_VERSION =	3.3.6
-DISTNAME =		sabyenc-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME}
+MODPY_EGG_VERSION =	4.0.2
+DISTNAME =		sabyenc3-${MODPY_EGG_VERSION}
+PKGNAME =		py-sabyenc-${MODPY_EGG_VERSION}
 
 CATEGORIES =		news
 
-# LGPLv2.1+
+HOMEPAGE =		https://github.com/sabnzbd/sabyenc
+
+# LGPLv3
 PERMIT_PACKAGE =	Yes
 
 WANTLIB +=		${MODPY_WANTLIB} pthread
@@ -17,4 +19,10 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
+FLAVORS =		python3
+FLAVOR =		python3
+
+# No test suites in pypi tarball
+NO_TEST =	Yes
+
 .include <bsd.port.mk>
diff --git a/news/py-sabyenc/distinfo b/news/py-sabyenc/distinfo
index 98e4f4d92fcf..8d4a1d3d5cec 100644
--- a/news/py-sabyenc/distinfo
+++ b/news/py-sabyenc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sabyenc-3.3.6.tar.gz) = pMrNAzJXfFKk5BbBhQnd8ryep/iWN6xtZ7UaYUKsfuE=
-SIZE (sabyenc-3.3.6.tar.gz) = 9831
+SHA256 (sabyenc3-4.0.2.tar.gz) = 36oL3QF1Kpz94NNJqPTheLBLHPnBvAGLKHlhGSzSu5A=
+SIZE (sabyenc3-4.0.2.tar.gz) = 10633
diff --git a/news/py-sabyenc/pkg/PLIST b/news/py-sabyenc/pkg/PLIST
index 6850dbb384d3..46fcde69efbc 100644
--- a/news/py-sabyenc/pkg/PLIST
+++ b/news/py-sabyenc/pkg/PLIST
@@ -1,7 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/02/27 04:26:28 bket Exp $
-lib/python${MODPY_VERSION}/site-packages/sabyenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/sabyenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/sabyenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/sabyenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/sabyenc-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/sabyenc.so
+@comment $OpenBSD: PLIST,v 1.2 2020/08/01 19:07:20 bket Exp $
+@conflict py-sabyenc-*
+@pkgpath news/py-sabyenc
+lib/python${MODPY_VERSION}/site-packages/sabyenc3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/sabyenc3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/sabyenc3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/sabyenc3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/sabyenc3-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+@so lib/python${MODPY_VERSION}/site-packages/sabyenc3.so