diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -18,6 +18,17 @@
 NOT_FOR_ARCHS=		mips mips64
 NOT_FOR_ARCHS_REASON=	SSP is currently broken on MIPS
 
+FLAVORS=	default jail
+FLAVORS?=	${FLAVORS:[1]}
+
+.if ${FLAVOR:U} == jail
+NET_SNMP_WITHOUT_MIB_MODULE_LIST+=	host
+NET_SNMP_WITHOUT_MIB_MODULE_LIST+=	ucd-snmp/memory
+CONFIGURE_ARGS+=			--without-kmem-usage
+.endif
+
+jail_PKGNAMESUFFIX=	-jail
+
 OPTIONS_DEFINE=	MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
 		MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS AX_DISABLE_TRAP \
 		TLS NEWSYSLOG NOLIBPKG SCTP
diff --git a/net/Makefile b/net/Makefile
--- a/net/Makefile
+++ b/net/Makefile
@@ -1090,6 +1090,7 @@
     SUBDIR += py-oauth
     SUBDIR += py-oauth2
     SUBDIR += py-paho-mqtt
+    SUBDIR += py-paho-mqtt1
     SUBDIR += py-pamqp
     SUBDIR += py-pcapy
     SUBDIR += py-pcapy-ng
diff --git a/net/py-paho-mqtt/Makefile b/net/py-paho-mqtt/Makefile
--- a/net/py-paho-mqtt/Makefile
+++ b/net/py-paho-mqtt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	paho-mqtt
 DISTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,6 +19,8 @@
 USE_PYTHON=	autoplist concurrent pep517
 SHEBANG_FILES=	examples/*.py
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}paho-mqtt1
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/py-paho-mqtt/Makefile b/net/py-paho-mqtt1/Makefile
copy from net/py-paho-mqtt/Makefile
copy to net/py-paho-mqtt1/Makefile
--- a/net/py-paho-mqtt/Makefile
+++ b/net/py-paho-mqtt1/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	paho-mqtt
-DISTVERSION=	2.1.0
+PORTVERSION=	1.6.1
 CATEGORIES=	net python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	paho_mqtt-${DISTVERSION}
+PKGNAMESUFFIX=	1
 
 MAINTAINER=	joe@thrallingpenguin.com
 COMMENT=	MQTT version 3.1/3.1.1 client class
@@ -12,12 +12,12 @@
 LICENSE=	EPL
 LICENSE_FILE=	${WRKSRC}/edl-v10
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0:devel/py-hatchling@${PY_FLAVOR}
-
 USES=		python shebangfix
-USE_PYTHON=	autoplist concurrent pep517
+USE_PYTHON=	distutils autoplist
 SHEBANG_FILES=	examples/*.py
 
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}paho-mqtt
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/net/py-paho-mqtt1/distinfo b/net/py-paho-mqtt1/distinfo
new file mode 100644
--- /dev/null
+++ b/net/py-paho-mqtt1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1643543609
+SHA256 (paho-mqtt-1.6.1.tar.gz) = 2a8291c81623aec00372b5a85558a372c747cbca8e9934dfe218638b8eefc26f
+SIZE (paho-mqtt-1.6.1.tar.gz) = 99373
diff --git a/net/py-paho-mqtt1/pkg-descr b/net/py-paho-mqtt1/pkg-descr
new file mode 100644
--- /dev/null
+++ b/net/py-paho-mqtt1/pkg-descr
@@ -0,0 +1,6 @@
+Python MQTT version 3.1/3.1.1 client class
+
+The MQTT protocol is a machine-to-machine (M2M)/"Internet of Things"
+connectivity protocol. Designed as an extremely lightweight publish/subscribe
+messaging transport, it is useful for connections with remote locations where
+a small code footprint is required and/or network bandwidth is at a premium.
diff --git a/sysutils/py-mqttwarn/Makefile b/sysutils/py-mqttwarn/Makefile
--- a/sysutils/py-mqttwarn/Makefile
+++ b/sysutils/py-mqttwarn/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mqttwarn
 DISTVERSION=	0.35.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +23,7 @@
 		${PYTHON_PKGNAMEPREFIX}funcy>0:devel/py-funcy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.18.2:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10.1:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}paho-mqtt>=1.4.0:net/py-paho-mqtt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}paho-mqtt1>=1.4.0:net/py-paho-mqtt1@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.13.0:devel/py-six@${PY_FLAVOR}