diff --git a/configure.ac b/configure.ac
index 7cd07baf..b218c242 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ define(RELEASE_NUM, 80)
 define(CDIO_VERSION_STR, 0.$1)
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.218 2007/12/28 02:11:01 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.219 2008/01/01 03:14:17 flameeyes Exp $])dnl
 AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
 AC_CONFIG_SRCDIR(src/cd-info.c)
 
@@ -87,6 +87,11 @@ AC_ARG_ENABLE(cpp_progs,
 	[  --enable-cpp-progs      make C++ example programs (default enabled)])
 AM_CONDITIONAL(ENABLE_CPP, test x"$enable_cpp_progs" = "xyes")
 
+AC_ARG_ENABLE(example_progs,
+	AC_HELP_STRING([--disable-example-progs], [Disable libcdio example programs building]))
+
+AM_CONDITIONAL(BUILD_EXAMPLES, test "x$enable_example_progs" != "xno")
+
 dnl We use C 
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/example/C++/Makefile.am b/example/C++/Makefile.am
index 62074847..c94ceaf9 100644
--- a/example/C++/Makefile.am
+++ b/example/C++/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.10 2006/04/15 16:18:33 rocky Exp $
+#   $Id: Makefile.am,v 1.11 2008/01/01 03:14:17 flameeyes Exp $
 #
 #    Copyright (C) 2005, 2006 Rocky Bernstein <rocky@cpan.org>
 #
@@ -25,8 +25,10 @@ SUBDIRS = OO
 if BUILD_CD_PARANOIA
 paranoia_progs = paranoia paranoia2
 endif
+if BUILD_EXAMPLES
 noinst_PROGRAMS = device eject isofile isofile2 isolist \
 	          mmc1 mmc2 $(paranoia_progs)
+endif
 
 INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)
 
diff --git a/example/Makefile.am b/example/Makefile.am
index bf1f4eef..60e539e4 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.40 2007/08/12 00:56:09 rocky Exp $
+#   $Id: Makefile.am,v 1.41 2008/01/01 03:14:17 flameeyes Exp $
 #
 #    Copyright (C) 2003, 2004, 2005, 2006
 #    Rocky Bernstein <rocky@cpan.org>
@@ -27,10 +27,12 @@ endif
 if BUILD_CD_PARANOIA
 paranoia_progs = paranoia paranoia2
 endif
+if BUILD_EXAMPLES
 noinst_PROGRAMS = audio cdchange cdtext device drives eject \
 	          isofile isofile2 isofuzzy isolist isolsn \
 	          mmc1 mmc2 mmc2a mmc3 $(paranoia_progs) tracks \
 	          sample3 sample4 udf1 udffile cdio-eject
+endif
 
 INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)