diff --git a/external/mit/xorg/server/xorg-server/cfb32/Makefile b/external/mit/xorg/server/xorg-server/cfb32/Makefile
index 515aa06f0a8b..6f5058dd8e1a 100644
--- a/external/mit/xorg/server/xorg-server/cfb32/Makefile
+++ b/external/mit/xorg/server/xorg-server/cfb32/Makefile
@@ -1,13 +1,11 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/02 21:19:21 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/24 13:24:12 rtr Exp $
+
+LIBISPRIVATE=	yes
+PIXELSIZE=	32
 
 .include "../Makefile.serverlib"
 
-PIXELSIZE=	32
+LIB=	cfb32
+SRCS=	${SRCS.cfb}
 
-.if ${MKX11LOADABLE} != "no"
-XMODULEDIR=	${X11USRLIBDIR}/modules
-SRCS=		cfbmodule32.c
-.endif
-
-.include "../Makefile.servermod"
 .include "../cfb/Makefile.cfb"
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile
index 533f1c74e7b7..72a4d64d462b 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/dixmods/cfb32/Makefile
@@ -1,7 +1,14 @@
-#	$NetBSD: Makefile,v 1.1 2008/08/06 07:16:40 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2008/08/24 13:24:12 rtr Exp $
+
+XMODULEDIR=     ${X11USRLIBDIR}/modules/extensions
+PIXELSIZE=	32
+
+.include "../../../../Makefile.serverlib"
+.include "../../../../Makefile.servermod"
 
 LIB=	cfb32
 
-SRCS=	cfb32module.c
+.PATH:	${X11SRCDIR.xorg-server}/hw/xfree86/dixmods
+SRCS=	${SRCS.cfb} cfb32module.c
 
-.include "../Makefile.dixmod"
+.include "../../../../cfb/Makefile.cfb"