diff --git a/configure.ac b/configure.ac
index 3425eec52..170243a4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2030,6 +2030,7 @@ hw/xwin/Makefile
 hw/darwin/Makefile
 hw/darwin/apple/Makefile
 hw/darwin/quartz/Makefile
+hw/darwin/quartz/xpr/Makefile
 hw/kdrive/Makefile
 hw/kdrive/ati/Makefile
 hw/kdrive/chips/Makefile
diff --git a/hw/darwin/quartz/Makefile.am b/hw/darwin/quartz/Makefile.am
index eb7d42790..f5199dfa2 100644
--- a/hw/darwin/quartz/Makefile.am
+++ b/hw/darwin/quartz/Makefile.am
@@ -4,8 +4,9 @@ AM_CFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_OBJCFLAGS = $(XSERVER_CFLAGS) $(DIX_CFLAGS)
 AM_CPPFLAGS = \
 	-I$(srcdir) -I$(srcdir)/.. \
-	-I$(top_srcdir)/miext/rootless \
-	-I$(top_srcdir)/miext/rootless/safeAlpha
+	-I$(top_srcdir)/miext/rootless
+
+SUBDIRS = xpr
 
 libXQuartz_a_SOURCES = \
 	X11Application.m \
@@ -18,16 +19,7 @@ libXQuartz_a_SOURCES = \
 	quartzCocoa.m \
 	quartzKeyboard.c \
 	quartzPasteboard.c \
-	quartzStartup.c \
-	appledri.c \
-	dri.c \
-	xprAppleWM.c \
-	xprCursor.c \
-	xprFrame.c \
-	xprScreen.c \
-	x-hash.c \
-	x-hook.c \
-	x-list.c
+	quartzStartup.c
 
 EXTRA_DIST = \
 	X11Application.h \
@@ -40,13 +32,4 @@ EXTRA_DIST = \
 	quartzCursor.c \
 	quartzCursor.h \
 	quartz.h \
-	quartzPasteboard.h \
-	dri.h \
-	dristruct.h \
-	appledri.h \
-	appledristr.h \
-	x-hash.h \
-	x-hook.h \
-	x-list.h \
-	Xplugin.h \
-	xpr.h
+	quartzPasteboard.h
diff --git a/hw/darwin/quartz/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h
similarity index 100%
rename from hw/darwin/quartz/Xplugin.h
rename to hw/darwin/quartz/xpr/Xplugin.h
diff --git a/hw/darwin/quartz/appledri.c b/hw/darwin/quartz/xpr/appledri.c
similarity index 100%
rename from hw/darwin/quartz/appledri.c
rename to hw/darwin/quartz/xpr/appledri.c
diff --git a/hw/darwin/quartz/appledri.h b/hw/darwin/quartz/xpr/appledri.h
similarity index 100%
rename from hw/darwin/quartz/appledri.h
rename to hw/darwin/quartz/xpr/appledri.h
diff --git a/hw/darwin/quartz/appledristr.h b/hw/darwin/quartz/xpr/appledristr.h
similarity index 100%
rename from hw/darwin/quartz/appledristr.h
rename to hw/darwin/quartz/xpr/appledristr.h
diff --git a/hw/darwin/quartz/dri.c b/hw/darwin/quartz/xpr/dri.c
similarity index 100%
rename from hw/darwin/quartz/dri.c
rename to hw/darwin/quartz/xpr/dri.c
diff --git a/hw/darwin/quartz/dri.h b/hw/darwin/quartz/xpr/dri.h
similarity index 100%
rename from hw/darwin/quartz/dri.h
rename to hw/darwin/quartz/xpr/dri.h
diff --git a/hw/darwin/quartz/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h
similarity index 100%
rename from hw/darwin/quartz/dristruct.h
rename to hw/darwin/quartz/xpr/dristruct.h
diff --git a/hw/darwin/quartz/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c
similarity index 100%
rename from hw/darwin/quartz/x-hash.c
rename to hw/darwin/quartz/xpr/x-hash.c
diff --git a/hw/darwin/quartz/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h
similarity index 100%
rename from hw/darwin/quartz/x-hash.h
rename to hw/darwin/quartz/xpr/x-hash.h
diff --git a/hw/darwin/quartz/x-hook.c b/hw/darwin/quartz/xpr/x-hook.c
similarity index 100%
rename from hw/darwin/quartz/x-hook.c
rename to hw/darwin/quartz/xpr/x-hook.c
diff --git a/hw/darwin/quartz/x-hook.h b/hw/darwin/quartz/xpr/x-hook.h
similarity index 100%
rename from hw/darwin/quartz/x-hook.h
rename to hw/darwin/quartz/xpr/x-hook.h
diff --git a/hw/darwin/quartz/x-list.c b/hw/darwin/quartz/xpr/x-list.c
similarity index 100%
rename from hw/darwin/quartz/x-list.c
rename to hw/darwin/quartz/xpr/x-list.c
diff --git a/hw/darwin/quartz/x-list.h b/hw/darwin/quartz/xpr/x-list.h
similarity index 100%
rename from hw/darwin/quartz/x-list.h
rename to hw/darwin/quartz/xpr/x-list.h
diff --git a/hw/darwin/quartz/xpr.h b/hw/darwin/quartz/xpr/xpr.h
similarity index 100%
rename from hw/darwin/quartz/xpr.h
rename to hw/darwin/quartz/xpr/xpr.h
diff --git a/hw/darwin/quartz/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c
similarity index 100%
rename from hw/darwin/quartz/xprAppleWM.c
rename to hw/darwin/quartz/xpr/xprAppleWM.c
diff --git a/hw/darwin/quartz/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c
similarity index 100%
rename from hw/darwin/quartz/xprCursor.c
rename to hw/darwin/quartz/xpr/xprCursor.c
diff --git a/hw/darwin/quartz/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c
similarity index 100%
rename from hw/darwin/quartz/xprFrame.c
rename to hw/darwin/quartz/xpr/xprFrame.c
diff --git a/hw/darwin/quartz/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c
similarity index 100%
rename from hw/darwin/quartz/xprScreen.c
rename to hw/darwin/quartz/xpr/xprScreen.c