--- /dev/null
+--- xc/programs/Xserver/os/Imakefile~ 2006-07-19 00:26:32.000000000 +0200
++++ xc/programs/Xserver/os/Imakefile 2006-07-19 00:28:43.000000000 +0200
+@@ -145,7 +145,7 @@
+ #endif
+
+ BOOTSTRAPCFLAGS =
+- SRCS = WaitFor.c access.c connection.c io.c $(COLOR_SRCS) \
++ SRCS = WaitFor.c access.c connection.c wrapper.c io.c $(COLOR_SRCS) \
+ $(BUILTIN_RGB_SRC) \
+ osinit.c utils.c log.c auth.c mitauth.c secauth.c \
+ $(XDMAUTHSRCS) $(RPCSRCS) $(KRB5SRCS) xdmcp.c OtherSources \
+@@ -298,6 +298,7 @@
+ LinkSourceFile(secauth.c,LinkDirectory)
+ LinkSourceFile(stdrgb.c,LinkDirectory)
+ LinkSourceFile(utils.c,LinkDirectory)
++LinkSourceFile(wrapper.c,LinkDirectory)
+ LinkSourceFile(xalloc.c,LinkDirectory)
+ LinkSourceFile(xdmauth.c,LinkDirectory)
+ LinkSourceFile(xdmcp.c,LinkDirectory)
+--- xc/programs/Xserver/Imakefile~ 2006-07-19 16:44:07.000000000 +0200
++++ xc/programs/Xserver/Imakefile 2006-07-19 16:44:20.000000000 +0200
+@@ -1712,6 +1712,7 @@
+
+
+ #if UseXserverWrapper
++all:: Xwrapper
+ SetUIDProgramTarget(Xwrapper,os/wrapper.o,NullParameter,$(PAMLIBS),NullParameter)
+ InstallProgramWithFlags(Xwrapper,$(BINDIR),$(INSTUIDFLAGS))
+ #endif