diff --git a/ChangeLog b/ChangeLog
index f5a00c60..2b14aa35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-24  Benoît Dejean  <benoit@placenet.org>
+
+	* Makefile.am:
+
+	Build examples only when needed.
+	Patch by dmacks@netspace.org.
+	Closes #342863.
+
 2006-06-24  Benoît Dejean  <benoit@placenet.org>
 
 	* libgtop-sysdeps.m4:
diff --git a/Makefile.am b/Makefile.am
index c02d7175..1dbb7c00 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,10 @@
 
-SUBDIRS = po misc include sysdeps lib src examples doc
+if EXAMPLES
+EXAMPLES_DIR = examples
+else
+EXAMPLES_DIR = 
+fi
+SUBDIRS = po misc include sysdeps lib src $(EXAMPLES_DIR) doc
 
 libgtopinclude_HEADERS = glibtop.h libgtopconfig.h
 libgtopincludedir = $(includedir)/libgtop-2.0