diff --git a/ChangeLog b/ChangeLog
index 304a915eba..3f89aec5ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+          add calls to AM_CONDITIONAL for subsystems for automake 1.6.x
+
 2004-02-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: pass required libxml version as argument
diff --git a/common b/common
index a2d2883feb..19cb5127af 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a2d2883febd16e51a267a580cc4413b2a17a91a9
+Subproject commit 19cb5127af898da4a72109547e9c31c4e14cc964
diff --git a/configure.ac b/configure.ac
index 8b956c0021..6041a6fb9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,16 +71,27 @@ if test "x$GST_CVS" = "xyes"; then
 fi
 
 dnl subsystems - can influence other decisions so needs to be high up
+dnl we need to do AM_CONDITIONAL them here for automake 1.6.x compatibility
 GST_CHECK_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem])
+AM_CONDITIONAL(GST_DISABLE_GST_DEBUG, test "x$GST_DISABLE_GST_DEBUG" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
+AM_CONDITIONAL(GST_DISABLE_LOADSAVE, test "x$GST_DISABLE_LOADSAVE" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
+AM_CONDITIONAL(GST_DISABLE_PARSE, test "x$GST_DISABLE_PARSE" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(TRACE,[tracing subsystem])
+AM_CONDITIONAL(GST_DISABLE_TRACE, test "x$GST_DISABLE_TRACE" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(ALLOC_TRACE,[allocation tracing])
+AM_CONDITIONAL(GST_DISABLE_ALLOC_TRACE, test "x$GST_DISABLE_ALLOC_TRACE" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(REGISTRY,[plugin registry])
+AM_CONDITIONAL(GST_DISABLE_REGISTRY, test "x$GST_DISABLE_REGISTRY" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(ENUMTYPES,[enum types])
+AM_CONDITIONAL(GST_DISABLE_ENUMTYPES, test "x$GST_DISABLE_ENUMTYPES" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(INDEX,[index])
+AM_CONDITIONAL(GST_DISABLE_INDEX, test "x$GST_DISABLE_INDEX" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(PLUGIN,[plugin])
+AM_CONDITIONAL(GST_DISABLE_PLUGIN, test "x$GST_DISABLE_PLUGIN" = "xyes")
 GST_CHECK_SUBSYSTEM_DISABLE(URI,[uri handlers])
+AM_CONDITIONAL(GST_DISABLE_URI, test "x$GST_DISABLE_URI" = "xyes")
 
 dnl ##############################
 dnl # Do automated configuration #