diff --git a/devel/bitkeeper/Makefile b/devel/bitkeeper/Makefile
index 2fb44fa7ea78..ff0a8b75d9b0 100644
--- a/devel/bitkeeper/Makefile
+++ b/devel/bitkeeper/Makefile
@@ -1,50 +1,54 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	bitkeeper
 PORTVERSION=	7.3.3
 PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	https://www.bitkeeper.org/downloads/${PORTVERSION}/
 DISTNAME=	bk-${PORTVERSION}.src
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Scalable Distributed Source Management System
 
 LICENSE=	APACHE20
 
 BROKEN_aarch64=		ld: error: undefined symbol: fpsetround
 BROKEN_riscv64=		fails to compile: src/gui/tcltk/tcl/unix/tclUnixInit.c:401:16: error: use of undeclared identifier 'FP_RN'
 BROKEN_FreeBSD_11=	perl: No such file or directory
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
 		${LOCALBASE}/include/tommath.h:math/libtommath \
 		bash:shells/bash
 LIB_DEPENDS=	libtomcrypt.so:security/libtomcrypt \
 		libpcre.so:devel/pcre	\
 		liblz4.so:archivers/liblz4 \
 		libtommath.so:math/libtommath \
 		libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake groff bison localbase tk xorg iconv pkgconfig
 USE_XORG=	x11 xrender xft
 
 SUB_FILES=	bk bk-man.conf
 MANDIRS=	${PREFIX}/bitkeeper/man
 
 WRKSRC=		${WRKDIR}/bk-${PORTVERSION}/src
 ALL_TARGET=	p
 
+post-patch:
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's/DESTDIR/PDESTDIR/g'
+
 do-build:
 	@(cd ${WRKSRC}; ${MAKE_CMD} ${ALL_TARGET})
 
 do-install:
 	@(cd ${WRKSRC}; \
-	${MAKE_CMD} DESTDIR=${STAGEDIR}${PREFIX}/bitkeeper ${INSTALL_TARGET}); \
+	${MAKE_CMD} PDESTDIR=${STAGEDIR}${PREFIX} ${INSTALL_TARGET})
 	${INSTALL_SCRIPT} ${WRKDIR}/bk ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKDIR}/bk-man.conf \
 		${STAGEDIR}${PREFIX}/etc/man.d/bk.conf
 
 .include <bsd.port.mk>
diff --git a/devel/bitkeeper/files/patch-src_Makefile b/devel/bitkeeper/files/patch-src_Makefile
new file mode 100644
index 000000000000..18deccec90ec
--- /dev/null
+++ b/devel/bitkeeper/files/patch-src_Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	2018-12-29 05:21:08.000000000 -0800
++++ Makefile	2021-03-30 17:02:38.009421000 -0700
+@@ -70,11 +70,7 @@
+ 	EXE=
+ 	# You can set this to anywhere you like and do a 
+ 	# build production" and you'll have an installed BitKeeper.
+-	ifeq (,$(INSTALLED_BK))
+-		BINDIR := /usr/local/bitkeeper
+-	else
+-		BINDIR := $(shell "$(INSTALLED_BK)" bin)
+-	endif
++	BINDIR := /bitkeeper
+ 	INSTALL=install
+ 	RESOURCE=
+ endif