diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index a3ae620c0f03..3ffe1921c457 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,26 +1,24 @@
 PORTNAME=	rvm
 DISTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
 		http://ftp.wu-wien.ac.at/pub/systems/coda/src/ \
 		ftp://ftp.coda.cs.cmu.edu/pub/rvm/src/ \
 		ftp://ftp.wu-wien.ac.at/pub/systems/coda/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Persistent VM library
 WWW=		http://www.coda.cs.cmu.edu/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_aarch64=	Fails to link: missing sbrk
-BROKEN_riscv64=	Fails to link: missing sbrk
-
 LIB_DEPENDS=	liblwp.so:devel/lwp
 
 USES=		libtool pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>
diff --git a/devel/rvm/files/patch-tests_rvm__basher.c b/devel/rvm/files/patch-tests_rvm__basher.c
new file mode 100644
index 000000000000..9fed5684cdd9
--- /dev/null
+++ b/devel/rvm/files/patch-tests_rvm__basher.c
@@ -0,0 +1,32 @@
+--- tests/rvm_basher.c.orig
++++ tests/rvm_basher.c
+@@ -1579,20 +1579,10 @@
+ /* print break point and limit */
+ static void show_break()
+     {
+-    rvm_length_t    cur_brk;
+ #ifdef RLIMIT_DATA
+     struct rlimit   rlp;
+ #endif
+ 
+-    /* get current break point */
+-    errno = 0;
+-    if ((cur_brk=(rvm_length_t)sbrk(0)) == -1)
+-        {
+-        printf("\n? Error getting current break point\n");
+-        printf("    errno = %d\n",errno);
+-        CODA_ASSERT(rvm_false);
+-        }
+-
+     /* get system maximum */
+     errno = 0;
+ #ifdef RLIMIT_DATA
+@@ -1604,8 +1594,6 @@
+         }
+ 
+     /* print the limits */
+-    printf("\nCurrent break point:         0x%lx\n",
+-           RVM_ROUND_LENGTH_UP_TO_PAGE_SIZE(cur_brk+5*RVM_PAGE_SIZE));
+     printf("Maximum data segment length: 0x%lx\n\n",rlp.rlim_max);
+ #endif
+     exit(0);