diff --git a/external/mit/xorg/server/xorg-server/XTrap/Makefile b/external/mit/xorg/server/xorg-server/XTrap/Makefile
index a5aceaf043f1..df4557901e10 100644
--- a/external/mit/xorg/server/xorg-server/XTrap/Makefile
+++ b/external/mit/xorg/server/xorg-server/XTrap/Makefile
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/24 13:25:03 rtr Exp $
+
+LIBISPRIVATE=	yes
 
 .include "../Makefile.serverlib"
 
-.if ${MKX11LOADABLE} != "no"
-XMODULEDIR=	${X11USRLIBDIR}/modules/extensions
-SRCS=		xf86XTrapModule.c
-CPPFLAGS+=	-DEXTMODULE
-.endif
+LIB=	XTrap
+SRCS=	${SRCS.XTrap}
 
-.include "../Makefile.servermod"
 .include "Makefile.xtrap"
diff --git a/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap b/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap
index 60ca4614b0af..24646dea25e6 100644
--- a/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap
+++ b/external/mit/xorg/server/xorg-server/XTrap/Makefile.xtrap
@@ -1,9 +1,7 @@
-#	$NetBSD: Makefile.xtrap,v 1.3 2008/08/15 15:55:05 rtr Exp $
-
-LIB=		XTrap
+#	$NetBSD: Makefile.xtrap,v 1.4 2008/08/24 13:25:03 rtr Exp $
 
 .PATH:		${X11SRCDIR.xorg-server}/XTrap
-SRCS+=		xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
+SRCS.XTrap=	xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11/extensions \
@@ -11,8 +9,6 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/pixman-1 \
 		-I${X11SRCDIR.xorg-server}/Xext
 
-CPPFLAGS+=	-DXORG_VERSION_CURRENT=${XORG_VERSION_CURRENT}
-
 # XXX
 COPTS.xtrapdi.c=	-Wno-error
 
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap/Makefile
index ee1824dbcd80..634df004f0f8 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/xtrap/Makefile
@@ -1,7 +1,13 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/06 07:16:41 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/24 13:25:03 rtr Exp $
 
-LIB=	xtrap
+XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
 
-SRCS=	xf86XTrapModule.c
+.include "../../../../Makefile.serverlib"
+.include "../../../../Makefile.servermod"
 
-.include "../Makefile.dixmod"
+LIB=	XTrap
+
+.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
+SRCS=	${SRCS.XTrap} xf86XTrapModule.c
+
+.include "../../../../XTrap/Makefile.xtrap"