diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
index f8a8bb89904e..1bed87600e15 100644
--- a/graphics/mesa-demos/Makefile
+++ b/graphics/mesa-demos/Makefile
@@ -1,31 +1,35 @@
 PORTNAME=	mesa-demos
 PORTVERSION=	8.4.0
 PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenGL demos distributed with Mesa
 WWW=		https://www.mesa3d.org/
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 CONFLICTS_INSTALL=	glx-utils
 
 USES=		gmake gl localbase pkgconfig tar:bzip2 xorg
 GNU_CONFIGURE=	yes
 USE_GL=		egl gbm gl glesv2 glew glu glut
 USE_XORG=	xorgproto x11 xdamage xext xfixes xi xxf86vm
 
 CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland \
 		--with-system-data-files
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
+post-stage:
+	# bitmap program conflicts with x11/bitmap
+	${MV} ${STAGEDIR}/${PREFIX}/bin/bitmap ${STAGEDIR}/${PREFIX}/bin/bitmap_demo
+
 .include <bsd.port.mk>
diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.am b/graphics/mesa-demos/files/patch-src-glsl-Makefile.am
deleted file mode 100644
index 0e78b3a233d5..000000000000
--- a/graphics/mesa-demos/files/patch-src-glsl-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-# Prevent conflict with x11/bitmap
-#
---- src/glsl/Makefile.am.orig	2014-03-22 12:59:24 UTC
-+++ src/glsl/Makefile.am
-@@ -38,7 +38,7 @@ if HAVE_GLUT
- bin_PROGRAMS = \
- 	array \
-         bezier \
--	bitmap \
-+	bitmap-demo \
- 	brick \
- 	bump \
- 	blinking-teapot \
-@@ -83,7 +83,7 @@ samplers_array_SOURCES = samplers.c
- samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
- 
- array_LDADD = ../util/libutil.la
--bitmap_LDADD = ../util/libutil.la
-+bitmap_demo_LDADD = ../util/libutil.la
- bezier_LDADD = ../util/libutil.la
- brick_LDADD = ../util/libutil.la
- bump_LDADD = ../util/libutil.la
diff --git a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in b/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
deleted file mode 100644
index f56b47d5e732..000000000000
--- a/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-# Prevent conflict with x11/bitmap
-#
---- src/glsl/Makefile.in.orig	2015-12-09 21:24:01 UTC
-+++ src/glsl/Makefile.in
-@@ -113,7 +113,7 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- @HAVE_GLUT_TRUE@bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \
--@HAVE_GLUT_TRUE@	bitmap$(EXEEXT) brick$(EXEEXT) bump$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	bitmap_demo$(EXEEXT) brick$(EXEEXT) bump$(EXEEXT) \
- @HAVE_GLUT_TRUE@	blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \
- @HAVE_GLUT_TRUE@	deriv$(EXEEXT) fragcoord$(EXEEXT) \
- @HAVE_GLUT_TRUE@	fsraytrace$(EXEEXT) \
-@@ -158,9 +158,9 @@ am__v_lt_1 = 
- bezier_SOURCES = bezier.c
- bezier_OBJECTS = bezier.$(OBJEXT)
- bezier_DEPENDENCIES = ../util/libutil.la
--bitmap_SOURCES = bitmap.c
--bitmap_OBJECTS = bitmap.$(OBJEXT)
--bitmap_DEPENDENCIES = ../util/libutil.la
-+bitmap_demo_SOURCES = bitmap.c
-+bitmap_demo_OBJECTS = bitmap.$(OBJEXT)
-+bitmap_demo_DEPENDENCIES = ../util/libutil.la
- blinking_teapot_SOURCES = blinking-teapot.c
- blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT)
- blinking_teapot_DEPENDENCIES = ../util/libutil.la
-@@ -546,7 +546,7 @@ gsraytrace_SOURCES = gsraytrace.cpp
- samplers_array_SOURCES = samplers.c
- samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
- array_LDADD = ../util/libutil.la
--bitmap_LDADD = ../util/libutil.la
-+bitmap_demo_LDADD = ../util/libutil.la
- bezier_LDADD = ../util/libutil.la
- brick_LDADD = ../util/libutil.la
- bump_LDADD = ../util/libutil.la
-@@ -694,9 +694,9 @@ bezier$(EXEEXT): $(bezier_OBJECTS) $(bez
- 	@rm -f bezier$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS)
- 
--bitmap$(EXEEXT): $(bitmap_OBJECTS) $(bitmap_DEPENDENCIES) $(EXTRA_bitmap_DEPENDENCIES) 
--	@rm -f bitmap$(EXEEXT)
--	$(AM_V_CCLD)$(LINK) $(bitmap_OBJECTS) $(bitmap_LDADD) $(LIBS)
-+bitmap_demo$(EXEEXT): $(bitmap_demo_OBJECTS) $(bitmap_demo_DEPENDENCIES) $(EXTRA_bitmap_demo_DEPENDENCIES) 
-+	@rm -f bitmap_demo$(EXEEXT)
-+	$(AM_V_CCLD)$(LINK) $(bitmap_demo_OBJECTS) $(bitmap_demo_LDADD) $(LIBS)
- 
- blinking-teapot$(EXEEXT): $(blinking_teapot_OBJECTS) $(blinking_teapot_DEPENDENCIES) $(EXTRA_blinking_teapot_DEPENDENCIES) 
- 	@rm -f blinking-teapot$(EXEEXT)