diff --git a/ChangeLog b/ChangeLog
index 4dde22345..c97ab7de8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-11  Eric Anholt  <anholt@FreeBSD.org>
+
+	* hw/vfb/InitOutput.c: (xf86WrapperInit):
+	* hw/xnest/Init.c: (xf86WrapperInit):
+	Add stub xf86WrapperInits so that the servers will build even if os/ was
+	built with XFree86LOADER set.
+
 2006-02-11  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* Xext/xres.c: 
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 630d3e133..be9768545 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -1044,3 +1044,5 @@ InitOutput(ScreenInfo *screenInfo, int argc, char **argv)
 int SelectWaitTime = 10000; /* usec */
 #endif
 
+void xf86WrapperInit(void);
+void xf86WrapperInit(void) { /* THANKS XFREE86 */ }
diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c
index f2e7122f3..ce603e603 100644
--- a/hw/xnest/Init.c
+++ b/hw/xnest/Init.c
@@ -162,3 +162,5 @@ void ddxBeforeReset(void)
 int SelectWaitTime = 10000; /* usec */
 #endif
 
+void xf86WrapperInit(void);
+void xf86WrapperInit(void) { /* THANKS XFREE86 */ }