diff --git a/Makefile.am b/Makefile.am
index 5450085877..696b60d572 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,13 +10,19 @@ else
 EXT_DIR=
 endif
 
+if BUILD_EXAMPLES
+EXAMPLES_DIR=examples
+else
+EXAMPLES_DIR=
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gstreamer-libs.pc gstreamer-play.pc
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = gst-element-check.m4
 
-SUBDIRS=gst-libs gst sys $(EXT_DIR) examples tools $(GCONF_DIR) testsuite
+SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite
 
 DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf testsuite
 
diff --git a/common b/common
index f2d9b99515..c73793f702 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit f2d9b99515c73da09bfe307d273d320f79a226da
+Subproject commit c73793f7022cbc8ffd39f9c0b0587078f47c0b06