diff --git a/devel/quirks/Makefile b/devel/quirks/Makefile
index 10515b26c4f..380f5bc8673 100644
--- a/devel/quirks/Makefile
+++ b/devel/quirks/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1162 2021/02/14 15:26:34 kn Exp $
+# $OpenBSD: Makefile,v 1.1163 2021/02/14 15:51:46 sthen Exp $
 
 COMMENT =	exceptions to pkg_add rules
 CATEGORIES =	devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =	quirks-3.550
+PKGNAME =	quirks-3.551
 PKG_ARCH =	*
 MAINTAINER =	Marc Espie <espie@openbsd.org>
 
diff --git a/devel/quirks/files/Quirks.pm b/devel/quirks/files/Quirks.pm
index b3c0d7e8593..bb34f6b8a99 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.1178 2021/02/14 15:26:34 kn Exp $
+# $OpenBSD: Quirks.pm,v 1.1179 2021/02/14 15:51:46 sthen Exp $
 #
 # Copyright (c) 2009 Marc Espie <espie@openbsd.org>
 #
@@ -540,6 +540,12 @@ my $stem_extensions = {
 	'stegcracker' => 'stegseek',
 	'py-ldap3' => 'py3-ldap3',
 	'py-qtpy' => 'py3-qtpy',
+	'py-sip' => 'py3-sip',
+	'py-sip-qt5' => 'py3-sip-qt5',
+	'py-qt5' => 'py3-qt5',
+	'py-ndg_httpsclient' => 'py3-ndg_httpsclient',
+	'py-trustme' => 'py3-trustme',
+	'py-mechanize' => 'py3-mechanize',
 };
 
 my $obsolete_reason = {
diff --git a/security/Makefile b/security/Makefile
index 0e73bed9166..ef923da841a 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.609 2021/02/02 20:11:44 jeremy Exp $
+# $OpenBSD: Makefile,v 1.610 2021/02/14 15:51:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += ADMsnmp
@@ -335,7 +335,6 @@
      SUBDIR += py-service_identity
      SUBDIR += py-service_identity,python3
      SUBDIR += py-tlsfuzzer,python3
-     SUBDIR += py-trustme
      SUBDIR += py-trustme,python3
      SUBDIR += py-vivisect
      SUBDIR += py-viv_utils
diff --git a/www/Makefile b/www/Makefile
index 930ed86526d..24e2a7070c5 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.999 2021/02/14 14:23:06 jasper Exp $
+# $OpenBSD: Makefile,v 1.1000 2021/02/14 15:51:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += analog
@@ -475,13 +475,11 @@
      SUBDIR += py-mako
      SUBDIR += py-mako,python3
      SUBDIR += py-mastodon.py
-     SUBDIR += py-mechanize
      SUBDIR += py-mechanize,python3
      SUBDIR += py-meld3
      SUBDIR += py-meld3,python3
      SUBDIR += py-metallum,python3
      SUBDIR += py-multidict,python3
-     SUBDIR += py-ndg-httpsclient
      SUBDIR += py-ndg-httpsclient,python3
      SUBDIR += py-paste
      SUBDIR += py-paste-deploy