diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index 727509a9381b..28e235498276 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -50,9 +50,17 @@ LIBDRM_REVISION=1
 PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"
+PLIST_SUB+=	X86=""
+.else
+PLIST_SUB+=	X86="@comment "
+.endif
+
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
 			   12661s/x86_/amd/g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
index 5cef834e71f0..d8cd14c43f6c 100644
--- a/graphics/libdrm/pkg-plist
+++ b/graphics/libdrm/pkg-plist
@@ -11,13 +11,13 @@
 %%OLD%%include/drm/savage_drm.h
 %%OLD%%include/drm/sis_drm.h
 %%OLD%%include/drm/via_drm.h
-%%OLD%%include/intel_bufmgr.h
+%%OLD%%%%X86%%include/intel_bufmgr.h
 %%NEW%%include/libdrm/drm.h
 %%NEW%%include/libdrm/drm_fourcc.h
 %%NEW%%include/libdrm/drm_mode.h
 %%NEW%%include/libdrm/drm_sarea.h
 %%NEW%%include/libdrm/i915_drm.h
-%%NEW%%include/libdrm/intel_bufmgr.h
+%%NEW%%%%X86%%include/libdrm/intel_bufmgr.h
 %%NEW%%include/libdrm/intel_debug.h
 %%NEW%%include/libdrm/mach64_drm.h
 %%NEW%%include/libdrm/mga_drm.h
@@ -53,9 +53,9 @@ include/xf86drmMode.h
 lib/libdrm.la
 lib/libdrm.so
 lib/libdrm.so.2
-lib/libdrm_intel.la
-lib/libdrm_intel.so
-lib/libdrm_intel.so.1
+%%X86%%lib/libdrm_intel.la
+%%X86%%lib/libdrm_intel.so
+%%X86%%lib/libdrm_intel.so.1
 lib/libdrm_nouveau.la
 lib/libdrm_nouveau.so
 lib/libdrm_nouveau.so.1
@@ -66,7 +66,7 @@ lib/libdrm_nouveau.so.1
 %%NEW%%%%KMS%%lib/libkms.so
 %%NEW%%%%KMS%%lib/libkms.so.1
 libdata/pkgconfig/libdrm.pc
-libdata/pkgconfig/libdrm_intel.pc
+%%X86%%libdata/pkgconfig/libdrm_intel.pc
 libdata/pkgconfig/libdrm_nouveau.pc
 %%NEW%%libdata/pkgconfig/libdrm_radeon.pc
 %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc