Index: head/sysutils/debootstrap/Makefile
===================================================================
--- head/sysutils/debootstrap/Makefile	(revision 568243)
+++ head/sysutils/debootstrap/Makefile	(revision 568244)
@@ -1,41 +1,49 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	debootstrap
 PORTVERSION=	1.0.123
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
-MASTER_SITES=	DEBIAN/pool/main/d/${PORTNAME}
+MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	trasz@FreeBSD.org
 COMMENT=	Install Debian or Ubuntu base system into a directory
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/debian/copyright
 
 RUN_DEPENDS=	wget:ftp/wget \
-		bash:shells/bash
+		bash:shells/bash \
+		gpgv2:security/gnupg \
+		${LOCALBASE}/share/keyrings/ubuntu-archive-keyring.gpg:security/ubuntu-keyring
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 USES=		gmake perl5
 USE_PERL5=	run
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/debootstrap
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/debootstrap
 	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 		${WRKSRC}/Makefile \
 		${WRKSRC}/debootstrap
+	@${REINPLACE_CMD} -e 's,gpgv,gpgv2,g' \
+		${WRKSRC}/Makefile \
+		${WRKSRC}/debootstrap \
+		${WRKSRC}/functions
+	@${FIND} ${WRKSRC}/scripts -type f | \
+		${XARGS} ${REINPLACE_CMD} -e 's,/usr/share/keyrings,${LOCALBASE}/share/keyrings,g'
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/debootstrap.8 \
 		${STAGEDIR}${MAN8PREFIX}/man/man8/debootstrap.8
 
 .include <bsd.port.mk>
Index: head/sysutils/debootstrap/pkg-message
===================================================================
--- head/sysutils/debootstrap/pkg-message	(revision 568243)
+++ head/sysutils/debootstrap/pkg-message	(revision 568244)
@@ -1,14 +1,14 @@
 [
 { type: install
   message: <<EOM
 To successfully create an installation of Debian or Ubuntu
 debootstrap requires the following kernel modules to be loaded:
 
 linux64 fdescfs linprocfs linsysfs tmpfs
 
-To install Ubuntu Bionic into /compat/ubuntu, use:
+To install Ubuntu 18.04 LTS (Bionic Beaver) into /compat/ubuntu, run as root:
 
-debootstrap --no-check-gpg bionic /compat/ubuntu
+debootstrap bionic /compat/ubuntu
 EOM
 }
 ]