diff --git a/x11/Xserver/Makefile.common b/x11/Xserver/Makefile.common
index 93cf078ecb78..1eda2fabb644 100644
--- a/x11/Xserver/Makefile.common
+++ b/x11/Xserver/Makefile.common
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.common,v 1.11 2004/02/07 12:28:13 rtr Exp $
+#	$NetBSD: Makefile.common,v 1.12 2004/02/21 01:51:43 sekiya Exp $
 
 # These define parts of the Xserver tree that are to be
 # conditionally compiled for different platforms.  See
@@ -34,7 +34,7 @@ XSERVER_XDREAMCAST?=	yes
 
 # XFree86 servers all need XFONT as well.
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "macppc" || ${MACHINE} == "cats"
+    ${MACHINE} == "macppc" || ${MACHINE} == "cats" || ${MACHINE} == "sgimips"
 XSERVER_NEEDS_XFONT=	yes
 XSERVER_XFREE86=	yes
 .endif
diff --git a/x11/Xserver/hw/xfree86/xf86_os/Makefile b/x11/Xserver/hw/xfree86/xf86_os/Makefile
index fd7ebb30c353..fe4cb9772743 100644
--- a/x11/Xserver/hw/xfree86/xf86_os/Makefile
+++ b/x11/Xserver/hw/xfree86/xf86_os/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2004/02/13 16:56:19 chris Exp $
+#	$NetBSD: Makefile,v 1.6 2004/02/21 01:51:43 sekiya Exp $
 
 .include "../../../Makefile.serverlib"
 
@@ -36,6 +36,12 @@ CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif
 
+.if ${MACHINE} == "sgimips"
+SRCS.bsd+=	mips_video.c bsdResource.c pm_noop.c lnx_agp.c
+.for _FN in ${SRCS.bsd}
+CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
+.endfor
+.endif
 
 .if ${MACHINE} == "cats"
 SRCS.bsd+=      arm_video.c bsdResource.c pm_noop.c agp_noop.c ioperm_noop.c
@@ -51,7 +57,7 @@ SRCS.bus=	Pci.c
 SRCS.bus+=	ix86Pci.c
 .endif
 
-.if ${MACHINE} == "macppc" || ${MACHINE} == "cats"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "cats" || ${MACHINE} == "sgimips"
 SRCS.bus+=	netbsdPci.c
 .endif
 
@@ -66,7 +72,8 @@ CPPFLAGS.IODelay.S=	-DUSE_GAS
 CPPFLAGS.SlowBcopy.S=	-DUSE_GAS
 .endif
 
-.if ${MACHINE} == "amd64" || ${MACHINE} == "macppc" || ${MACHINE} == "cats"
+.if 	${MACHINE} == "amd64" || ${MACHINE} == "macppc" || \
+	${MACHINE} == "cats" || ${MACHINE} == "sgimips"
 SRCS.misc+=	CBUSmemcpy.c CIODelay.c CSlowBcopy.c
 .endif