diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 1d9754c2dad6..ca810da20e5f 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	giflib
 PORTVERSION=	5.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Tools and library routines for working with GIF images
 WWW=		https://sourceforge.net/projects/giflib/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 TEST_DEPENDS=	ghead:sysutils/coreutils
 
 USES=		cpe gmake
 CPE_VENDOR=	giflib_project
 USE_LDCONFIG=	yes
 
 MAKE_ARGS=	CC=${CC} \
 		LDFLAGS="${LDFLAGS}" \
 		OFLAGS="${CFLAGS}" \
 		PREFIX="${PREFIX}"
 TEST_TARGET=	check
 
 CFLAGS+=	-DHAVE_REALLOCARRAY
 
 CONFLICTS_INSTALL=	giftool
 
-BINARY_ALIAS=	head ghead
-
 OPTIONS_DEFINE=	DOCS
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
 		"! ( -name Makefile -o -name *\.[17] -o -name *\.xml )"
 	${MV} ${STAGEDIR}${DOCSDIR}/index.html.in ${STAGEDIR}${DOCSDIR}/index.html
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} --strip-unneeded ${STAGEDIR}${PREFIX}/lib/libgif.so.7.2.0
 
 .include <bsd.port.mk>
diff --git a/graphics/giflib/files/patch-tests_makefile b/graphics/giflib/files/patch-tests_makefile
new file mode 100644
index 000000000000..dbabec4d495a
--- /dev/null
+++ b/graphics/giflib/files/patch-tests_makefile
@@ -0,0 +1,15 @@
+--- tests/makefile.orig	2019-03-28 17:05:25 UTC
++++ tests/makefile
+@@ -104,10 +106,10 @@ giffilter-regress:
+ 
+ giffix-rebuild:
+ 	@echo "Rebuilding giffix test."
+-	@head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
++	@ghead --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d >giffixed.ico
+ giffix-regress:
+ 	@echo "giffix: Testing giffix behavior"
+-	@head --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico -
++	@ghead --bytes=-20 <$(PICS)/treescap.gif | $(UTILS)/giffix 2>/dev/null | $(UTILS)/gifbuild -d | diff -u giffixed.ico -
+ 
+ gifinto-regress:
+ 	@echo "gifinto: Checking behavior on short files."