diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 5c398c2210a1..dfbda1481c27 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,35 +1,41 @@
 PORTNAME=	oregano
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.84.43
 PORTREVISION=	6
 CATEGORIES=	cad
+MASTER_SITES=	https://waf.io/:new_waf # for Python-3.11 compatibility
+DISTFILES=	waf-2.1.1:new_waf
+EXTRACT_ONLY=	${GH_ACCOUNT}-${GH_PROJECT}-${DISTVERSIONFULL}_GH0${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Schematic capture and circuit simulator
 WWW=		https://ahoi.io/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	nroff:textproc/groff
 LIB_DEPENDS=	libgoocanvas-2.0.so:graphics/goocanvas2
 
 USES=		compiler:c11 desktop-file-utils gettext gnome pkgconfig \
 		shared-mime-info waf
 USE_GITHUB=	yes
 GH_ACCOUNT=	drahnr
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 gtksourceview3 intltool libxml2 pango
 
 GLIB_SCHEMAS=	io.ahoi.oregano.gschema.xml
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
+post-extract: # use newer waf that is Python-3.11 compatible
+	@${CP} ${DISTDIR}/waf-2.1.1 ${WRKSRC}/waf
+
 post-stage:
 	@cd ${STAGEDIR}${PREFIX} && ${STRIP_CMD} bin/oregano bin/microtests
 	${RM} ${STAGEDIR}${PREFIX}/share/glib-2.0/schemas/gschemas.compiled
 
 .include <bsd.port.mk>
diff --git a/cad/oregano/distinfo b/cad/oregano/distinfo
index e44b6be18e5c..f8659b58a412 100644
--- a/cad/oregano/distinfo
+++ b/cad/oregano/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1579937881
+TIMESTAMP = 1717897892
+SHA256 (waf-2.1.1) = 2e66e01fd564f09106419389119c78143327c89a35f26ee3ed376f0ee410a14d
+SIZE (waf-2.1.1) = 108070
 SHA256 (drahnr-oregano-v0.84.43_GH0.tar.gz) = c62442f2fdb01899f6f76b13099a043c563e43de9b356e6f1b18974d70a07111
 SIZE (drahnr-oregano-v0.84.43_GH0.tar.gz) = 1881499