diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile
index c3d9cd79cdda..de324b088a60 100644
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@@ -9,12 +9,6 @@ COMMENT=	Off-Screen Mesa implementation of the OpenGL API
 
 USE_XORG=	glproto
 
-# As of version 17.0.5 / 17.1.2, the Gallium variant fails to build due to
-# incorrectly ordered linker flags. Fortunately, autoreconf fixes the problem.
-# Unfortunately, we must reconf before we know if we're doing a Gallium build.
-USES=		autoreconf
-EXTRA_PATCHES=	${PATCHDIR}/configure.ac
-
 .include <bsd.port.options.mk>
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
diff --git a/graphics/mesa-dri/Makefile.targets b/graphics/mesa-dri/Makefile.targets
index ce6a2ab94a65..67879ff7ed4e 100644
--- a/graphics/mesa-dri/Makefile.targets
+++ b/graphics/mesa-dri/Makefile.targets
@@ -5,9 +5,6 @@
 post-patch:
 .if ${OPSYS} == FreeBSD
 	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
-. if ${COMPONENT} == osmesa
-	@${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure.ac
-. endif
 .endif
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
 		${WRKSRC}/src/util/xmlconfig.c