diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 937a4987e280..f2de8ba34ce5 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	5.0.2
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R6.7.0-src1.tar.gz \
@@ -32,4 +32,9 @@ PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
+.if ${ARCH} == amd64
+PLIST_SUB+=	NO_AMD64="@comment "
+.else
+PLIST_SUB+=	NO_AMD64=""
+.endif
 .include <bsd.port.post.mk>
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index e165729f00d9..c3fcecbdcb66 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -5,4 +5,5 @@ lib/modules/dri/mga_dri.so
 lib/modules/dri/r128_dri.so
 lib/modules/dri/r200_dri.so
 lib/modules/dri/radeon_dri.so
-lib/modules/dri/tdfx_dri.so
+%%I386%%lib/modules/dri/sis_dri.so
+%%NO_AMD64%%lib/modules/dri/tdfx_dri.so
diff --git a/graphics/xfree86-dri/Makefile b/graphics/xfree86-dri/Makefile
index 937a4987e280..f2de8ba34ce5 100644
--- a/graphics/xfree86-dri/Makefile
+++ b/graphics/xfree86-dri/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dri
 PORTVERSION=	5.0.2
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XORG}
 DISTFILES=	X11R6.7.0-src1.tar.gz \
@@ -32,4 +32,9 @@ PLIST_SUB+=	I386=""
 .else
 PLIST_SUB+=	I386="@comment "
 .endif
+.if ${ARCH} == amd64
+PLIST_SUB+=	NO_AMD64="@comment "
+.else
+PLIST_SUB+=	NO_AMD64=""
+.endif
 .include <bsd.port.post.mk>
diff --git a/graphics/xfree86-dri/pkg-plist b/graphics/xfree86-dri/pkg-plist
index e165729f00d9..c3fcecbdcb66 100644
--- a/graphics/xfree86-dri/pkg-plist
+++ b/graphics/xfree86-dri/pkg-plist
@@ -5,4 +5,5 @@ lib/modules/dri/mga_dri.so
 lib/modules/dri/r128_dri.so
 lib/modules/dri/r200_dri.so
 lib/modules/dri/radeon_dri.so
-lib/modules/dri/tdfx_dri.so
+%%I386%%lib/modules/dri/sis_dri.so
+%%NO_AMD64%%lib/modules/dri/tdfx_dri.so