diff --git a/MOVED b/MOVED
index e4c3dadf782e..3bb36fe083ec 100644
--- a/MOVED
+++ b/MOVED
@@ -14279,3 +14279,4 @@ x11/rox-wallpaper||2020-02-16|Has expired: Old, uses EOLed python27
 x11-fm/rox-mime-editor||2020-02-16|Has expired: Old, uses EOLed python27
 x11-fm/rox-session||2020-02-16|Has expired: Old, uses EOLed python27
 graphics/py-PyX|graphics/py-pyx|2020-02-16|Use lowercase port name
+misc/brs|misc/bible-kjv|2020-02-17|Match upstream name (successor to brs)
diff --git a/misc/brs/Makefile b/misc/bible-kjv/Makefile
similarity index 89%
rename from misc/brs/Makefile
rename to misc/bible-kjv/Makefile
index eee1a92df8df..beb20d3351c6 100644
--- a/misc/brs/Makefile
+++ b/misc/bible-kjv/Makefile
@@ -1,10 +1,10 @@
 # Created by: Kim Scarborough <user@unknown.nu>
 # $FreeBSD$
 
-PORTNAME=	brs
+PORTNAME=	bible-kjv
 PORTVERSION=	4.30
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_DEBIAN:C|/%SUBDIR%/|/pool/main/${DISTNAME:C/^(.).*$/\1/}/${DISTNAME:C/_.*//}/|}
+MASTER_SITES=	DEBIAN
 DISTNAME=	bible-kjv_${DISTVERSION}
 
 MAINTAINER=	andrew@tao11.riddles.org.uk
@@ -19,7 +19,7 @@ USE_PERL5=	build
 # building its build tools. Parallel build randomly fails.
 MAKE_JOBS_UNSAFE=yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/_.*//}
+WRKSRC=	${WRKDIR}/${PORTNAME}
 
 # makeindex2 asks for bash, but contains no shell construct more
 # complex than an if...then, so use sh instead.
diff --git a/misc/brs/distinfo b/misc/bible-kjv/distinfo
similarity index 100%
rename from misc/brs/distinfo
rename to misc/bible-kjv/distinfo
diff --git a/misc/brs/pkg-descr b/misc/bible-kjv/pkg-descr
similarity index 100%
rename from misc/brs/pkg-descr
rename to misc/bible-kjv/pkg-descr
diff --git a/misc/brs/pkg-plist b/misc/bible-kjv/pkg-plist
similarity index 100%
rename from misc/brs/pkg-plist
rename to misc/bible-kjv/pkg-plist