Index: head/devel/android-tools-adb/Makefile
===================================================================
--- head/devel/android-tools-adb/Makefile	(revision 390136)
+++ head/devel/android-tools-adb/Makefile	(revision 390137)
@@ -1,25 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
-DISTVERSION=	5.0.0_r7
-PORTREVISION=	1
+DISTVERSION=	5.1.1_r4
 CATEGORIES=	devel
+MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:bashcomp
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		bash_completion.d/adb?id=2b8cfec:bashcomp
+EXTRACT_ONLY=	${DISTFILES:N*\:bashcomp:C/:.*//}
 
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Android debug bridge command line tool
 
 LICENSE=	APACHE20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	android
 GH_PROJECT=	platform_system_core
 
 USES=		uidfix
 WRKSRC_SUBDIR=	adb
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin"
 
-PLIST_FILES=	bin/adb
+PLIST_FILES=	bin/adb \
+		%%BASH%%etc/bash_completion.d/adb
+PORTDOCS=	*.txt *.TXT
+
+OPTIONS_DEFINE=	BASH DOCS
+OPTIONS_SUB=	yes
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBASH}
+LICENSE+=	MIT # debian/copyright
+LICENSE_COMB=	multi
+.endif
+
+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-adb/distinfo
===================================================================
--- head/devel/android-tools-adb/distinfo	(revision 390136)
+++ head/devel/android-tools-adb/distinfo	(revision 390137)
@@ -1,2 +1,4 @@
-SHA256 (android-platform_system_core-android-5.0.0_r7_GH0.tar.gz) = 8f2761c98f59b6860bc084a9f17b78e91543f8606aea179c293256ee05fa7c77
-SIZE (android-platform_system_core-android-5.0.0_r7_GH0.tar.gz) = 1203009
+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 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
+SIZE (bash_completion.d/adb?id=2b8cfec) = 5198