diff --git a/ChangeLog b/ChangeLog
index acfc906387..99f16841c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: Michal Benes  <michal dot benes at xeris dot cz>
+
+	* tests/Makefile.am:
+	  Don't try to build tests in tests/icles if we
+	  don't have X (#323852)
+
 2006-03-16  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* gst-libs/gst/tag/gstid3tag.c:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2badd454e4..8155e1a3e9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -10,10 +10,16 @@ else
 SUBDIRS_CHECK =
 endif
 
+if USE_X
+SUBDIRS_ICLES = icles
+else
+SUBDIRS_ICLES =
+endif
+
 SUBDIRS = 			\
 	$(SUBDIRS_CHECK)	\
 	$(SUBDIRS_EXAMPLES)	\
-	icles
+	$(SUBDIRS_ICLES)
 
 DIST_SUBDIRS = 			\
 	check			\