diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index 34d3c401f504..f3a07e6860a0 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -8,20 +8,25 @@
 PORTNAME=	utah-glx
 PORTVERSION=	0.9.20001128
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/mesa3d/g}
 MASTER_SITE_SUBDIR=	sobomax
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		MesaLib-${MESA_VER}${EXTRACT_SUFX} \
+		MesaDemos-${MESA_VER}${EXTRACT_SUFX}
 
 MAINTAINER=	3d@FreeBSD.org
 
 BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83 \
-		autoconf:${PORTSDIR}/devel/autoconf \
-		nonexistent:${PORTSDIR}/graphics/Mesa3:patch
+		autoconf:${PORTSDIR}/devel/autoconf
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
+MESA_VER=	3.2.1
+
 GLVER?=		14
 GLUTVER?=	3
 
@@ -30,7 +35,7 @@ AGP_DEVICE=	/dev/agpgart
 CFLAGS+=	-DAGP_DEVICE=\\\"${AGP_DEVICE}\\\"
 CONFIGURE_SCRIPT=autogen.sh
 CONFIGURE_ARGS=	--enable-extra \
-		--with-mesa=${WRKDIRPREFIX}${.CURDIR}/../../graphics/Mesa3/work/Mesa-3.2.1 \
+		--with-mesa=${WRKDIR}/Mesa-${MESA_VER} \
 		--sysconfdir=${PREFIX}/etc \
 		--with-moduledir=${PREFIX}/lib/modules
 CONFIGURE_ENV=	TCLSH="tclsh8.3"
diff --git a/graphics/utah-glx/distinfo b/graphics/utah-glx/distinfo
index 2d8aa28125a3..5e35f9bcabef 100644
--- a/graphics/utah-glx/distinfo
+++ b/graphics/utah-glx/distinfo
@@ -1 +1,3 @@
 MD5 (utah-glx-0.9.20001128.tar.bz2) = 926c61c22c659802e044de85bb8dd9cb
+MD5 (MesaLib-3.2.1.tar.bz2) = dcd5a6aa77b3bdb400c8179419473e58
+MD5 (MesaDemos-3.2.1.tar.bz2) = 621bd95ed9f93467f4dfa615e2f27c16