Index: Mk/Uses/samba.mk
===================================================================
--- Mk/Uses/samba.mk
+++ Mk/Uses/samba.mk
@@ -18,7 +18,7 @@
 IGNORE=		USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
 .  endif
 
-.  if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20
+.  if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 && ${SAMBA_DEFAULT} != 4.22
 IGNORE=		Invalid version of samba: ${SAMBA_DEFAULT}
 .  endif
 
@@ -39,6 +39,10 @@
 SAMBA_TALLOC_PORT_420=	devel/talloc242
 SAMBA_TDB_PORT_420=	databases/tdb1410
 SAMBA_TEVENT_PORT_420=	devel/tevent016
+SAMBA_PORT_422=         net/samba422
+SAMBA_TALLOC_PORT_422=  devel/talloc243
+SAMBA_TDB_PORT_422=     databases/tdb1413
+SAMBA_TEVENT_PORT_422=  devel/tevent017
 
 SAMBA_PORT=		${SAMBA_PORT_${SAMBA_SUFFIX}}
 SAMBA_INCLUDEDIR=	${LOCALBASE}/include/samba4
Index: Mk/bsd.default-versions.mk
===================================================================
--- Mk/bsd.default-versions.mk
+++ Mk/bsd.default-versions.mk
@@ -148,7 +148,7 @@
 RUBY_DEFAULT?=		3.3
 # Possible values: rust, rust-nightly
 RUST_DEFAULT?=		rust
-# Possible values: 4.16, 4.19, 4.20
+# Possible values: 4.16, 4.19, 4.20, 4.22
 SAMBA_DEFAULT?=		4.16
 # When updating this, please also update the same list in ssl.mk and the checks
 # for USES=ssl in qa.sh!