Index: head/devel/android-tools-fastboot/Makefile
===================================================================
--- head/devel/android-tools-fastboot/Makefile	(revision 389027)
+++ head/devel/android-tools-fastboot/Makefile	(revision 389028)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-fastboot
 DISTVERSION=	4.0.4_r2.1
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android Fastboot protocol CLI tool
 
 LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	android
 GH_PROJECT=	platform_system_core
 GH_TAGNAME=	${GH_ACCOUNT}-${DISTVERSION}
 
 USES=		uidfix
 WRKSRC_SUBDIR=	fastboot
 MAKEFILE=	${FILESDIR}/Makefile
-MAKE_ENV=	FILESDIR=${FILESDIR} BINDIR=${PREFIX}/bin
+MAKE_ENV=	FILESDIR="${FILESDIR}" BINDIR="${PREFIX}/bin"
 PLIST_FILES=	bin/fastboot
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-fastboot/files/Makefile
===================================================================
--- head/devel/android-tools-fastboot/files/Makefile	(revision 389027)
+++ head/devel/android-tools-fastboot/files/Makefile	(revision 389028)
@@ -1,27 +1,27 @@
 # $FreeBSD$
 
 PROG=	fastboot
 NO_MAN=
 BINDIR?=/usr/bin
 
 SRCS+=	bootimg.c
 SRCS+=	engine.c
 SRCS+=	fastboot.c
 SRCS+=	protocol.c
 
 .PATH:	${FILESDIR}
 SRCS+=	usb_freebsd.c
 SRCS+=	util_freebsd.c
 
 .PATH:	${.CURDIR}/../libzipfile
 SRCS+=	centraldir.c
 SRCS+=	zipfile.c
 
-CFLAGS+=-I.
-CFLAGS+=-I../include
-CFLAGS+=-I../mkbootimg
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../include
+CFLAGS+=-I${.CURDIR}/../mkbootimg
 
 LDADD+=	-lusb -lz
 DPADD+=	${LIBUSB} ${LIBZ}
 
 .include <bsd.prog.mk>