diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index d31e88bf9435..04463512298a 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -72,7 +72,8 @@
 .Ar ...
 .Sh DESCRIPTION
 .Bf -symbolic
-This daemon is obsolete.
+This daemon is deprecated and will be removed before
+.Fx 13.0 .
 Users are advised to use
 .Xr autofs 5
 instead.
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 7ec49ce1cec5..5efe0d81be99 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -414,6 +414,8 @@ main(int argc, char *argv[])
     progname = "amd";
   am_set_progname(progname);
 
+  plog(XLOG_WARNING, "built-in amd in FreeBSD is deprecated and will be removed before FreeBSD 13");
+
   /*
    * Initialize process id.  This is kept
    * cached since it is used for generating
diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile
index 14266be83932..de1e89e708f0 100644
--- a/usr.sbin/jail/Makefile
+++ b/usr.sbin/jail/Makefile
@@ -15,6 +15,13 @@ NO_WMISSING_VARIABLE_DECLARATIONS=
 YFLAGS+=-v
 CFLAGS+=-I. -I${.CURDIR}
 
+# workaround for GNU ld (GNU Binutils) 2.33.1:
+#   relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2'
+# https://bugs.freebsd.org/242109
+.if defined(LINKER_TYPE) && ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv"
+CFLAGS+=-Wl,--no-relax
+.endif
+
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif