Index: head/devel/android-tools-fastboot/Makefile
===================================================================
--- head/devel/android-tools-fastboot/Makefile	(revision 389238)
+++ head/devel/android-tools-fastboot/Makefile	(revision 389239)
@@ -1,52 +1,64 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
 DISTVERSION=	5.1.1_r4
 PORTREVISION=	3
 CATEGORIES=	devel
-MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
-DISTFILES=	fastboot.1?id=706e754:manpage
-EXTRACT_ONLY=	${DISTFILES:N*\:manpage:C/:.*//}
+MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp,manpage
+DISTFILES=	bash_completion.d/fastboot?id=2b8cfec:bashcomp \
+		fastboot.1?id=706e754:manpage
+EXTRACT_ONLY=	${DISTFILES:N*\:bashcomp:N*\:manpage:C/:.*//}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android Fastboot protocol CLI tool
 
 LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	android jbeich:extras,libselinux
 GH_PROJECT=	platform_system_core platform_system_extras:extras \
 		platform_external_libselinux:libselinux
 
 USES=		uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin" \
 		MANDIR="${PREFIX}/man/man" \
 		LIBPCRE="${LOCALBASE}/lib/libpcre.a"
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_FILES=	bin/fastboot \
+		%%BASH%%etc/bash_completion.d/fastboot \
 		man/man1/fastboot.1.gz
 PORTDOCS=	fastboot_protocol.txt
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	BASH DOCS
+OPTIONS_SUB=	yes
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBASH}
+LICENSE+=	MIT # debian/copyright
+.endif
+
 post-extract:
 	@${CP} ${_DISTDIR}/${DISTFILES:M*\:manpage:C/:.*//} \
 		${BUILD_WRKSRC}/${DISTFILES:M*\:manpage:C/\?.*//}
 # Adjust paths relative to core
 	@(cd ${WRKSRC_extras} && ${COPYTREE_SHARE} . ${WRKSRC})
 	@${MV} ${WRKSRC_libselinux} ${WRKSRC}/libselinux
 
 post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//:H}
+	${INSTALL_DATA} ${_DISTDIR}/${DISTFILES:M*\:bashcomp:C/:.*//} \
+		${STAGEDIR}${PREFIX}/${PLIST_FILES:M%%BASH%%*:C/%%.*%%//}
 	(cd ${INSTALL_WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-fastboot/distinfo
===================================================================
--- head/devel/android-tools-fastboot/distinfo	(revision 389238)
+++ head/devel/android-tools-fastboot/distinfo	(revision 389239)
@@ -1,8 +1,10 @@
+SHA256 (bash_completion.d/fastboot?id=2b8cfec) = 12ef37bff8230e5e164e4ef5b9c1be1e5518cf066a04479f61e5ebf3761d4bc4
+SIZE (bash_completion.d/fastboot?id=2b8cfec) = 3051
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
 SHA256 (android-platform_system_core-android-5.1.1_r4_GH0.tar.gz) = 076421a742ef98158d5ea290b8aed007f2115521f1e39832d8be3560e990ea13
 SIZE (android-platform_system_core-android-5.1.1_r4_GH0.tar.gz) = 1210714
 SHA256 (jbeich-platform_system_extras-android-5.1.1_r4_GH0.tar.gz) = 43230a03c166b4000336a3bf13a73b91b69b672a9522efcd6d346cdc7e52e154
 SIZE (jbeich-platform_system_extras-android-5.1.1_r4_GH0.tar.gz) = 282780
 SHA256 (jbeich-platform_external_libselinux-android-5.1.1_r4_GH0.tar.gz) = 81bda8ddee4830c62415f308eaea85736b0c2c02324801fe67a712ce192360df
 SIZE (jbeich-platform_external_libselinux-android-5.1.1_r4_GH0.tar.gz) = 49185