diff --git a/ChangeLog b/ChangeLog
index abfecee68..4e4bc2523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-06  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* hw/dmx/examples/Makefile.am: 
+	Don't build "ev" example on systems without <linux/input.h>
+
 2005-10-06  Kristian Høgsberg  <krh@redhat.com>
 
 	* hw/xfree86/parser/Makefile.am: Add cpconfig.c to EXTRA_DIST.
diff --git a/hw/dmx/examples/Makefile.am b/hw/dmx/examples/Makefile.am
index 14359bc69..9a7f19e25 100644
--- a/hw/dmx/examples/Makefile.am
+++ b/hw/dmx/examples/Makefile.am
@@ -1,8 +1,13 @@
+if DMX_BUILD_USB 
+# Requires <linux/input.h>
+EV_PROG = ev
+endif
+
 bin_PROGRAMS = \
 	xdmx dmxwininfo dmxreconfig dmxresize \
 	dmxaddscreen dmxrmscreen \
 	dmxaddinput dmxrminput
-noinst_PROGRAMS = xinput xtest evi res xled xbell ev
+noinst_PROGRAMS = xinput xtest evi res xled xbell $(EV_PROG)
 
 xdmx_SOURCES = xdmx.c
 xdmx_LDADD = @DMXEXAMPLES_DEP_LIBS@