diff --git a/ChangeLog b/ChangeLog
index 9f64d58936..d139508824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-11-29  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
+
+	* check/Makefile.am:
+	  look in the right place for elements, a lot more chance of
+	  success
+	* gst/Makefile.am:
+	  remove indexers and elements subdirs
+	* plugins/Makefile.am:
+	  make indexers conditional
+
 2005-11-29  Thomas Vander Stichele  <thomas (at) apestaart (dot) org>
 
 	* Makefile.am:
diff --git a/check/Makefile.am b/check/Makefile.am
index e563c69fb7..84a14d8dfb 100644
--- a/check/Makefile.am
+++ b/check/Makefile.am
@@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         $(REGISTRY_ENVIRONMENT)                                 \
         GST_PLUGIN_SYSTEM_PATH=					\
-        GST_PLUGIN_PATH=$(top_builddir)/gst/elements:$(top_builddir)/gst/indexers
+        GST_PLUGIN_PATH=$(top_builddir)/plugins
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
diff --git a/gst/Makefile.am b/gst/Makefile.am
index b141eade1a..3b7cd22fa8 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -36,10 +36,8 @@ endif
 
 if GST_DISABLE_INDEX
 GST_INDEX_SRC = 
-SUBDIRS_INDEX =
 else
 GST_INDEX_SRC = gstindex.c gstindexfactory.c
-SUBDIRS_INDEX = indexers
 endif
 
 if GST_DISABLE_PLUGIN
@@ -68,12 +66,10 @@ SUBDIRS = \
 	$(SUBDIRS_PARSE) \
 	. \
 	base \
-	elements \
-	$(SUBDIRS_INDEX) \
 	$(SUBDIRS_NET) \
 	$(SUBDIRS_CHECK)
 
-DIST_SUBDIRS = base elements parse indexers net check
+DIST_SUBDIRS = base parse net check
 
 # make variables for all generated source and header files to make the
 # distinction clear
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index fd1944f2db..f6ed61a774 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1 +1,9 @@
-SUBDIRS = elements indexers
+if GST_DISABLE_INDEX
+SUBDIRS_INDEX =
+else
+SUBDIRS_INDEX = indexers
+endif
+
+SUBDIRS = elements $(SUBDIRS_INDEX)
+
+DIST_SUBDIRS = elements indexers
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index e563c69fb7..84a14d8dfb 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -10,7 +10,7 @@ REGISTRY_ENVIRONMENT = \
 TESTS_ENVIRONMENT = \
         $(REGISTRY_ENVIRONMENT)                                 \
         GST_PLUGIN_SYSTEM_PATH=					\
-        GST_PLUGIN_PATH=$(top_builddir)/gst/elements:$(top_builddir)/gst/indexers
+        GST_PLUGIN_PATH=$(top_builddir)/plugins
 
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@