diff --git a/MOVED b/MOVED
index db8c3d3b194..7b6c9ae8e74 100644
--- a/MOVED
+++ b/MOVED
@@ -17192,3 +17192,8 @@ www/npm-node17|www/npm-node18|2022-06-03|Renamed for www/node update to v18
 www/yarn-node17|www/yarn-node18|2022-06-03|Renamed for www/node update to v18
 security/keepassx-devel||2022-06-05|Has expired: KeePassX had been stopped development/maintenance, please consider using security/keepassxc instead
 sysutils/uefi-edk2-qemu|sysutils/edk2@qemu|2022-06-05|No more need for this port: please use sysutils/edk2 FLAVOR qemu instead
+graphics/gltt||2022-06-08|Abdonware, depends on freetype1
+print/ttftot42||2022-06-08|Abdonware, depends on freetype1
+print/freetype|print/freetype2|2022-06-08|Has been replaced long ago by freetype2
+net/libgnetwork||2022-06-08|Gnome2 library unused anymore
+x11-wm/compizconfig-backend-gconf||2022-06-08|gconf support has been removed from compiz
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index 7da3b85d582..20cdbd588fa 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -63,6 +63,7 @@
 # Feature:	autoreconf
 # Usage:	USES=autoreconf or USES=autoreconf:args
 # Valid args:	build	Don't run autoreconf, only add build dependencies
+#		2.69	Use this legacy version
 #
 # MAINTAINER:	ports@FreeBSD.org
 
@@ -70,7 +71,7 @@
 _INCLUDE_USES_AUTORECONF_MK=	yes
 _USES_POST+=	autoreconf
 
-AUTORECONF?=	${LOCALBASE}/bin/autoreconf
+AUTORECONF?=	${LOCALBASE}/bin/autoreconf${_AUTORECONF}
 AUTORECONF_WRKSRC?=	${WRKSRC}
 
 .endif
@@ -78,20 +79,37 @@ AUTORECONF_WRKSRC?=	${WRKSRC}
 .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
 _INCLUDE_USES_AUTORECONF_POST_MK=	yes
 
-BUILD_DEPENDS+=	autoconf>=2.69:devel/autoconf \
-		automake>=1.16.1:devel/automake
+.  if ${autoreconf_ARGS:M2.69}
+_AUTORECONF=	2.69
+BUILD_DEPENDS+=	autoconf2.69>=2.69:devel/autoconf2.69
+.  else
+_AUTORECONF=	2.71
+BUILD_DEPENDS+=	autoconf>=2.71:devel/autoconf
+.  endif
+
+BUILD_DEPENDS+=	automake>=1.16.5:devel/automake
 
 .  if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
 BUILD_DEPENDS+=	libtoolize:devel/libtool
 .  endif
 
-.  if empty(autoreconf_ARGS)
+# In case autoconf-switch wrapper scripts are used during build.
+CONFIGURE_ENV+=	DEFAULT_AUTOCONF=${_AUTORECONF}
+MAKE_ENV+=	DEFAULT_AUTOCONF=${_AUTORECONF}
+
+.  if ${autoreconf_ARGS:Nbuild:N2.69}
+IGNORE= 	incorrect 'USES+=autoreconf:${autoreconf_ARGS}'\
+		expecting 'USES+=autoreconf[:build,2.69]'
+.  endif
+
+.  if ! ${autoreconf_ARGS:Mbuild}
 _USES_configure+=	470:do-autoreconf
 do-autoreconf:
 .    for f in AUTHORS ChangeLog INSTALL NEWS README
 # Don't modify time stamps if the files already exist
 	@test -e ${AUTORECONF_WRKSRC}/${f} || ${TOUCH} ${AUTORECONF_WRKSRC}/${f}
 .    endfor
+.    if ${_AUTORECONF} == 2.69
 	@(cd ${AUTORECONF_WRKSRC} && \
 		if test -f configure.ac; then configure=configure.ac; \
 		else configure=configure.in; fi && \
@@ -103,11 +121,10 @@ do-autoreconf:
 		then if ! ${LOCALBASE}/bin/intltoolize -f -c; then \
 		${ECHO_MSG} '===>  Mk/Uses/autoreconf.mk: Error running intltoolize'; \
 		${FALSE}; fi; fi)
+.    endif
 	@(cd ${AUTORECONF_WRKSRC} && if ! ${AUTORECONF} -f -i; then \
 		${ECHO_MSG} '===>  Mk/Uses/autoreconf.mk: Error running ${AUTORECONF}'; \
 		${FALSE}; fi)
-.  elif ! ${autoreconf_ARGS:Mbuild}
-IGNORE= Incorrect 'USES+=autoreconf:${autoreconf_ARGS}' expecting 'USES+=autoreconf[:build]'
 .  endif
 
 .endif
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index 4d4a0921abf..f9a46043d64 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -97,7 +97,7 @@ WRKSRC_crate_${_crate}=	${WRKDIR}/${_wrksrc}
 
 CARGO_BUILDDEP?=	yes
 .  if ${CARGO_BUILDDEP:tl} == "yes"
-BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.59.0:lang/${RUST_DEFAULT}
+BUILD_DEPENDS+=	${RUST_DEFAULT}>=1.61.0:lang/${RUST_DEFAULT}
 .  endif
 
 # Location of toolchain (default to lang/rust's toolchain)
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index b15f55c4bc7..59f4db16043 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -415,11 +415,7 @@ gnome-post-gconf-schemas:
 .  endif
 
 .  if defined(GLIB_SCHEMAS)
-_USES_install+=	690:gnome-post-glib-schemas
-gnome-post-glib-schemas:
-	@for i in ${GLIB_SCHEMAS}; do \
-		${ECHO_CMD} "share/glib-2.0/schemas/$${i}" >> ${TMPPLIST}; \
-	done
+PLIST_FILES+=	${GLIB_SCHEMAS:C,^,share/glib-2.0/schemas/,}
 .  endif
 
 .endif
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 4997aa86031..146779a26df 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -78,8 +78,8 @@ BINARY_ALIAS+=	python3=${PYTHON_CMD}
 BUNDLE_LIBS=	yes
 
 BUILD_DEPENDS+=	llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
-				rust-cbindgen>=0.19.0:devel/rust-cbindgen \
-				${RUST_DEFAULT}>=1.59.0:lang/${RUST_DEFAULT} \
+				rust-cbindgen>=0.23.0:devel/rust-cbindgen \
+				${RUST_DEFAULT}>=1.61.0:lang/${RUST_DEFAULT} \
 				node:www/node
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 RUN_DEPENDS+=	${LOCALBASE}/lib/libpci.so:devel/libpci
diff --git a/UPDATING b/UPDATING
index 3909759e1f0..249d5a35a93 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20220608:
+  AFFECTS: devel/autoconf-wrapper, devel/autoconf213
+  AUTHOR: tijl@FreeBSD.org
+
+  These ports have been renamed to devel/autoconf-switch and devel/autoconf2.13
+  respectively.  If your favourite port updating tool cannot handle that then
+  just remove the packages with "pkg delete" and then install the new port.
+
+20220607:
+  AFFECTS: security/openssh-portable
+  AUTHOR: bdrewery@FreeBSD.org
+
+  OpenSSH has been updated to 9.0p1 with incompatible changes.
+  See https://www.openssh.com/txt/release-9.0 for details.
+
 20220602:
   AFFECTS: sysutils/graylog
   AUTHOR: dch@FreeBSD.org