diff --git a/Makefile.am b/Makefile.am
index add69d193..b296e0cfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,10 @@ if PRESENT
 PRESENT_DIR=present
 endif
 
+if PSEUDORAMIX
+PSEUDORAMIX_DIR=pseudoramiX
+endif
+
 SUBDIRS = \
 	doc \
 	man \
@@ -37,11 +41,11 @@ SUBDIRS = \
 	Xext \
 	miext \
 	os \
-	pseudoramiX \
 	randr \
 	render  \
 	Xi \
 	xkb \
+	$(PSEUDORAMIX_DIR) \
 	$(DBE_DIR) \
 	$(RECORD_DIR) \
 	xfixes \
diff --git a/configure.ac b/configure.ac
index 560c46030..0312c4f51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2174,6 +2174,8 @@ if test "x$XQUARTZ" = xyes; then
 	fi
 fi
 
+AM_CONDITIONAL(PSEUDORAMIX, [test "x$XQUARTZ" = xyes -o "x$XWIN" = xyes ])
+
 # Support for objc in autotools is minimal and not documented.
 OBJC='$(CC)'
 OBJCLD='$(CCLD)'