diff --git a/configure.ac b/configure.ac
index 56c3496322..a2d0729434 100644
--- a/configure.ac
+++ b/configure.ac
@@ -378,8 +378,6 @@ GST_SUBSYSTEM_DISABLE(GST_DEBUG,[debugging subsystem])
 
 translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_LOADSAVE, true)
 GST_SUBSYSTEM_DISABLE(LOADSAVE,[pipeline XML load/save])
-translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_AUTOPLUG, true)
-GST_SUBSYSTEM_DISABLE(AUTOPLUG,[autoplugger subsystem])
 translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_PARSE, true)
 GST_SUBSYSTEM_DISABLE(PARSE,[command-line parser])
 translit(dnm, m, l) AM_CONDITIONAL(GST_DISABLE_TRACE, true)
diff --git a/docs/gst/gstreamer-docs.sgml b/docs/gst/gstreamer-docs.sgml
index 9cc12a4462..1344062b0f 100644
--- a/docs/gst/gstreamer-docs.sgml
+++ b/docs/gst/gstreamer-docs.sgml
@@ -2,7 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
                "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY Gst SYSTEM "xml/gst.xml">
-<!ENTITY GstAutoplug SYSTEM "xml/gstautoplug.xml">
 <!ENTITY GstAtomic SYSTEM "xml/gstatomic.xml">
 <!ENTITY GstBin SYSTEM "xml/gstbin.xml">
 <!ENTITY GstConfig SYSTEM "xml/gstconfig.xml">
@@ -44,10 +43,6 @@
 <!ENTITY GstIndex SYSTEM "xml/gstindex.xml">
 <!ENTITY cothreads SYSTEM "xml/cothreads.xml">
 
-<!-- if none of the API is documented, these shouldn't go in
-<!ENTITY GstStaticAutoplug SYSTEM "xml/gststaticautoplug.xml">
-<!ENTITY GstStaticAutoplugRender SYSTEM "xml/gststaticautoplugrender.xml">
--->
 <!ENTITY GstAggregator SYSTEM "xml/gstaggregator.xml">
 <!ENTITY GstFakeSrc SYSTEM "xml/gstfakesrc.xml">
 <!ENTITY GstFakeSink SYSTEM "xml/gstfakesink.xml">
@@ -156,18 +151,6 @@ with some more specialized elements.</para>
     -->
   </chapter>
 
-<!-- no API is documented of these elements
-  <chapter id="autopluggers">
-    <title>GStreamer Autopluggers</title>
-
-    <para>the autopluggers provide a way to automatically construct elements based on
-    sink and src capabilities</para>
-
-    &GstStaticAutoplug;
-    &GstStaticAutoplugRender;
-  </chapter>
--->
-
 <!--
   <chapter id="gst-index">
     <title>Index</title>
diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
index f641d0a2ef..ab2de1ff67 100644
--- a/docs/gst/gstreamer-sections.txt
+++ b/docs/gst/gstreamer-sections.txt
@@ -639,45 +639,6 @@ GST_IS_ELEMENT_FACTORY_CLASS
 </SECTION>
 
 
-<SECTION>
-<FILE>gstautoplug</FILE>
-<TITLE>GstAutoplug</TITLE>
-GstAutoplug
-GstAutoplugFlags
-gst_autoplug_signal_new_object
-gst_autoplug_to_caps
-gst_autoplug_to_renderers
-<SUBSECTION Standard>
-GstAutoplugClass
-GST_AUTOPLUG
-GST_IS_AUTOPLUG
-GST_TYPE_AUTOPLUG
-gst_autoplug_get_type
-GST_AUTOPLUG_CLASS
-GST_IS_AUTOPLUG_CLASS
-GST_TYPE_AUTOPLUG_FLAGS
-gst_autoplug_flags_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gstautoplugfactory</FILE>
-<TITLE>GstAutoplugFactory</TITLE>
-GstAutoplugFactory
-gst_autoplug_factory_new
-gst_autoplug_factory_destroy
-gst_autoplug_factory_find
-gst_autoplug_factory_create
-gst_autoplug_factory_make
-<SUBSECTION Standard>
-gst_autoplug_factory_get_type
-GstAutoplugFactoryClass
-GST_TYPE_AUTOPLUG_FACTORY
-GST_AUTOPLUG_FACTORY
-GST_AUTOPLUG_FACTORY_CLASS
-GST_IS_AUTOPLUG_FACTORY
-GST_IS_AUTOPLUG_FACTORY_CLASS
-</SECTION>
-
 <SECTION>
 <FILE>gstclock</FILE>
 GstClockTime
@@ -1614,28 +1575,3 @@ GST_IS_INDEX_FACTORY_CLASS
 </SECTION>
 
 
-<SECTION>
-<FILE>gststaticautoplug</FILE>
-<TITLE>GstStaticAutoplug</TITLE>
-<SUBSECTION Standard>
-GstStaticAutoplug
-GST_STATIC_AUTOPLUG
-GST_IS_STATIC_AUTOPLUG
-GST_TYPE_STATIC_AUTOPLUG
-gst_static_autoplug_get_type
-GST_STATIC_AUTOPLUG_CLASS
-GST_IS_STATIC_AUTOPLUG_CLASS
-</SECTION>
-
-<SECTION>
-<FILE>gststaticautoplugrender</FILE>
-<TITLE>GstStaticAutoplugRender</TITLE>
-<SUBSECTION Standard>
-GstStaticAutoplugRender
-GST_STATIC_AUTOPLUG_RENDER
-GST_IS_STATIC_AUTOPLUG_RENDER
-GST_TYPE_STATIC_AUTOPLUG_RENDER
-gst_static_autoplug_render_get_type
-GST_STATIC_AUTOPLUG_RENDER_CLASS
-GST_IS_STATIC_AUTOPLUG_RENDER_CLASS
-</SECTION>
diff --git a/docs/gst/gstreamer.types b/docs/gst/gstreamer.types
index d561d86f1e..03825dff6e 100644
--- a/docs/gst/gstreamer.types
+++ b/docs/gst/gstreamer.types
@@ -11,8 +11,6 @@ gst_pad_template_get_type
 gst_ghost_pad_get_type
 gst_thread_get_type
 gst_plugin_feature_get_type
-gst_autoplug_get_type
-gst_autoplug_factory_get_type
 gst_type_find_factory_get_type
 gst_element_factory_get_type
 gst_scheduler_factory_get_type
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 69a0458e61..c7d650c31b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,12 +4,6 @@ else
 GST_LOADSAVE_DIRS = xml typefind
 endif
 
-if GST_DISABLE_AUTOPLUG
-GST_AUTOPLUG_DIRS = 
-else
-GST_AUTOPLUG_DIRS = autoplug helloworld2
-endif
-
 SUBDIRS = 				\
 	helloworld			\
 	queue				\
@@ -24,13 +18,9 @@ SUBDIRS = 				\
 	pingpong			\
 	manual				\
 	retag				\
-	$(GST_LOADSAVE_DIRS)		\
-	$(GST_AUTOPLUG_DIRS) 
+	$(GST_LOADSAVE_DIRS)
 
-
-DIST_SUBDIRS = autoplug			\
-	helloworld			\
-	helloworld2			\
+DIST_SUBDIRS = helloworld		\
 	queue				\
 	queue2				\
 	queue3				\
diff --git a/examples/manual/Makefile.am b/examples/manual/Makefile.am
index e5121edfd5..e3f328932e 100644
--- a/examples/manual/Makefile.am
+++ b/examples/manual/Makefile.am
@@ -4,19 +4,13 @@ else
 GNOME=
 endif
 
-if GST_DISABLE_AUTOPLUG
-GST_AUTOPLUG_SRC =
-else
-GST_AUTOPLUG_SRC = helloworld2
-endif
-
 if GST_DISABLE_LOADSAVE
 GST_LOADSAVE_SRC =
 else
 GST_LOADSAVE_SRC = xml-mp3
 endif
 
-EXAMPLES = dynamic $(GNOME) helloworld $(GST_AUTOPLUG_SRC) queue threads $(GST_LOADSAVE_SRC)
+EXAMPLES = dynamic $(GNOME) helloworld queue threads $(GST_LOADSAVE_SRC)
 noinst_PROGRAMS = $(EXAMPLES)
 
 LDADD = $(GST_LIBS)
@@ -35,5 +29,5 @@ EXTRA_DIST = extract.pl
 # also, it's a bit irritating that right now a change in any xml file
 # triggers a rebuild of all examples
 #%.c:
-dynamic.c gnome.c helloworld.c helloworld2.c queue.c threads.c xml-mp3.c: $(top_srcdir)/docs/manual/*.xml
+dynamic.c gnome.c helloworld.c queue.c threads.c xml-mp3.c: $(top_srcdir)/docs/manual/*.xml
 	$(PERL_PATH) $(srcdir)/extract.pl $@ $(top_srcdir)/docs/manual/*.xml
diff --git a/gst/Makefile.am b/gst/Makefile.am
index a9fe911bf9..f9634039cf 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -15,14 +15,6 @@ else
 GST_LOADSAVE_SRC = gstxml.c
 endif
 
-if GST_DISABLE_AUTOPLUG
-GST_AUTOPLUG_SRC =
-GST_AUTOPLUG_DIRS =
-else
-GST_AUTOPLUG_SRC = gstautoplug.c
-GST_AUTOPLUG_DIRS = autoplug
-endif
-
 if GST_DISABLE_PARSE
 GST_PARSE_SRC = 
 GST_PARSE_DIRS = 
@@ -75,9 +67,9 @@ else
 GST_URI_SRC = gsturi.c
 endif
 
-EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gstparse.c gstautoplug.c gsttrace.c
+EXTRA_libgstreamer_@GST_MAJORMINOR@_la_SOURCES = gstcpuid_i386.s gstmarshal.list gstxml.c gstparse.c gsttrace.c
 
-SUBDIRS = $(GST_PARSE_DIRS) $(GST_REGISTRY_DIRS) . $(GST_AUTOPLUG_DIRS) elements schedulers $(GST_INDEX_DIRS) 
+SUBDIRS = $(GST_PARSE_DIRS) $(GST_REGISTRY_DIRS) . autoplug elements schedulers $(GST_INDEX_DIRS) 
 DIST_SUBDIRS = autoplug elements parse registries schedulers indexers
 
 libgstreamer_@GST_MAJORMINOR@_la_SOURCES =		\
@@ -86,7 +78,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES =		\
 	$(GST_ENUMTYPES_SRC)	\
 	gstobject.c		\
 	gstatomic.c		\
-	$(GST_AUTOPLUG_SRC)	\
 	gstbin.c		\
 	gstbuffer.c		\
 	gstbufferpool-default.c	\
@@ -107,8 +98,8 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES =		\
 	gstpipeline.c		\
 	gstplugin.c		\
 	gstpluginfeature.c	\
-	gstprobe.c		\
 	gstprops.c		\
+	gstprobe.c		\
 	gstqueue.c		\
 	gstquery.c		\
 	gstscheduler.c		\
@@ -150,7 +141,6 @@ gst_headers =			\
 	gst.h			\
 	gstatomic.h		\
 	gstobject.h		\
-	gstautoplug.h		\
 	gstbin.h		\
 	gstbuffer.h		\
 	gstbufferpool-default.h \
diff --git a/gst/autoplug/Makefile.am b/gst/autoplug/Makefile.am
index 15af40920d..5d65e44036 100644
--- a/gst/autoplug/Makefile.am
+++ b/gst/autoplug/Makefile.am
@@ -1,32 +1,8 @@
 plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
 
 plugin_LTLIBRARIES = \
-	libgststaticautoplug.la \
-	libgststaticautoplugrender.la \
-	libgstautoplugcache.la \
-	libgstautoplugger.la \
 	libgstspider.la
 
-libgststaticautoplug_la_SOURCES = gststaticautoplug.c 
-libgststaticautoplug_la_CFLAGS = $(GST_CFLAGS)
-libgststaticautoplug_la_LIBADD =
-libgststaticautoplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-libgststaticautoplugrender_la_SOURCES = gststaticautoplugrender.c
-libgststaticautoplugrender_la_CFLAGS = $(GST_CFLAGS)
-libgststaticautoplugrender_la_LIBADD =
-libgststaticautoplugrender_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-libgstautoplugcache_la_SOURCES = gstautoplugcache.c
-libgstautoplugcache_la_CFLAGS = $(GST_CFLAGS)
-libgstautoplugcache_la_LIBADD =
-libgstautoplugcache_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
-libgstautoplugger_la_SOURCES = gstautoplugger.c
-libgstautoplugger_la_CFLAGS = $(GST_CFLAGS)
-libgstautoplugger_la_LIBADD =
-libgstautoplugger_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-
 libgstspider_la_SOURCES = \
 	gstspider.c gstspideridentity.c \
 	gstsearchfuncs.c
@@ -34,13 +10,9 @@ libgstspider_la_CFLAGS = $(GST_CFLAGS)
 libgstspider_la_LIBADD =
 libgstspider_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = gststaticautoplug.h gststaticautoplugrender.h \
-	gstspider.h gstspideridentity.h gstsearchfuncs.h 
+noinst_HEADERS = gstspider.h gstsearchfuncs.h 
 
-noinst_PROGRAMS = autoplugtest spidertest
-
-autoplugtest_CFLAGS = $(GST_CFLAGS)
-autoplugtest_LDADD = $(GST_LIBS)
+noinst_PROGRAMS = spidertest
 
 spidertest_SOURCES = spidertest.c
 spidertest_CFLAGS = $(GST_CFLAGS)
diff --git a/gst/gst.c b/gst/gst.c
index f81e567eba..e42096a210 100644
--- a/gst/gst.c
+++ b/gst/gst.c
@@ -511,9 +511,6 @@ init_post (void)
   gst_scheduler_factory_get_type ();
   gst_type_find_factory_get_type ();
   gst_bin_get_type ();
-#ifndef GST_DISABLE_AUTOPLUG
-  gst_autoplug_factory_get_type ();
-#endif /* GST_DISABLE_AUTOPLUG */
 #ifndef GST_DISABLE_INDEX
   gst_index_factory_get_type ();
 #endif /* GST_DISABLE_INDEX */
diff --git a/gst/gst.h b/gst/gst.h
index 45662fe285..adadf0c913 100644
--- a/gst/gst.h
+++ b/gst/gst.h
@@ -31,7 +31,6 @@
 #include <gst/gsttypes.h>
 #include <gst/gstversion.h>
 
-#include <gst/gstautoplug.h>
 #include <gst/gstbin.h>
 #include <gst/gstbuffer.h>
 #include <gst/gstbufferpool-default.h>
diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in
index 24c6e0a427..9898435049 100644
--- a/gst/gstconfig.h.in
+++ b/gst/gstconfig.h.in
@@ -10,7 +10,6 @@
 #define GST_DISABLE_LOADSAVE_REGISTRY 1
 #define GST_DISABLE_GST_DEBUG 1
 #define GST_DISABLE_LOADSAVE 1
-#define GST_DISABLE_AUTOPLUG 1
 #define GST_DISABLE_PARSE 1
 #define GST_DISABLE_TRACE 1
 #define GST_DISABLE_ALLOC_TRACE 1
@@ -30,9 +29,6 @@
 /* DOES NOT WORK */
 @GST_DISABLE_LOADSAVE_DEFINE@
 
-/* DOES NOT WORK */
-@GST_DISABLE_AUTOPLUG_DEFINE@
-
 /* DOES NOT WORK */
 @GST_DISABLE_PARSE_DEFINE@
 
diff --git a/gst/registries/gstxmlregistry.c b/gst/registries/gstxmlregistry.c
index dcf10b3d2a..adcf7ae222 100644
--- a/gst/registries/gstxmlregistry.c
+++ b/gst/registries/gstxmlregistry.c
@@ -36,7 +36,6 @@
 #include <gst/gstelement.h>
 #include <gst/gsttypefind.h>
 #include <gst/gstscheduler.h>
-#include <gst/gstautoplug.h>
 #include <gst/gsturi.h>
 #include <gst/gstinfo.h>
 
@@ -796,21 +795,6 @@ gst_xml_registry_parse_scheduler_factory (GMarkupParseContext *context, const gc
   return TRUE;
 }
 
-static gboolean
-gst_xml_registry_parse_autoplug_factory (GMarkupParseContext *context, const gchar *tag, const gchar *text,
-                                         gsize text_len, GstXMLRegistry *registry, GError **error)
-{
-  GstAutoplugFactory *factory = GST_AUTOPLUG_FACTORY (registry->current_feature);
-
-  if (!strcmp (tag, "name")) {
-    registry->current_feature->name = g_strndup (text, text_len);
-  }
-  else if (!strcmp (tag, "longdesc")) {
-    factory->longdesc = g_strndup (text, text_len);
-  }
-  return TRUE;
-}
-
 static gboolean
 gst_xml_registry_parse_index_factory (GMarkupParseContext *context, const gchar *tag, const gchar *text,
                                       gsize text_len, GstXMLRegistry *registry, GError **error)
@@ -937,9 +921,6 @@ gst_xml_registry_start_element (GMarkupParseContext *context,
 	    xmlregistry->parser = gst_xml_registry_parse_scheduler_factory;
             GST_SCHEDULER_FACTORY (feature)->type = 0;
 	  }
-	  else if (GST_IS_AUTOPLUG_FACTORY (feature)) {
-	    xmlregistry->parser = gst_xml_registry_parse_autoplug_factory;
-	  }
 	  else if (GST_IS_INDEX_FACTORY (feature)) {
 	    xmlregistry->parser = gst_xml_registry_parse_index_factory;
 	  }
@@ -1514,9 +1495,6 @@ gst_xml_registry_save_feature (GstXMLRegistry *xmlregistry, GstPluginFeature *fe
   else if (GST_IS_SCHEDULER_FACTORY (feature)) {
     PUT_ESCAPED ("longdesc", GST_SCHEDULER_FACTORY (feature)->longdesc);
   }
-  else if (GST_IS_AUTOPLUG_FACTORY (feature)) {
-    PUT_ESCAPED ("longdesc", GST_AUTOPLUG_FACTORY (feature)->longdesc);
-  }
   else if (GST_IS_INDEX_FACTORY (feature)) {
     PUT_ESCAPED ("longdesc", GST_INDEX_FACTORY (feature)->longdesc);
   }
diff --git a/tests/old/examples/Makefile.am b/tests/old/examples/Makefile.am
index 69a0458e61..c7d650c31b 100644
--- a/tests/old/examples/Makefile.am
+++ b/tests/old/examples/Makefile.am
@@ -4,12 +4,6 @@ else
 GST_LOADSAVE_DIRS = xml typefind
 endif
 
-if GST_DISABLE_AUTOPLUG
-GST_AUTOPLUG_DIRS = 
-else
-GST_AUTOPLUG_DIRS = autoplug helloworld2
-endif
-
 SUBDIRS = 				\
 	helloworld			\
 	queue				\
@@ -24,13 +18,9 @@ SUBDIRS = 				\
 	pingpong			\
 	manual				\
 	retag				\
-	$(GST_LOADSAVE_DIRS)		\
-	$(GST_AUTOPLUG_DIRS) 
+	$(GST_LOADSAVE_DIRS)
 
-
-DIST_SUBDIRS = autoplug			\
-	helloworld			\
-	helloworld2			\
+DIST_SUBDIRS = helloworld		\
 	queue				\
 	queue2				\
 	queue3				\
diff --git a/tests/old/examples/manual/Makefile.am b/tests/old/examples/manual/Makefile.am
index e5121edfd5..e3f328932e 100644
--- a/tests/old/examples/manual/Makefile.am
+++ b/tests/old/examples/manual/Makefile.am
@@ -4,19 +4,13 @@ else
 GNOME=
 endif
 
-if GST_DISABLE_AUTOPLUG
-GST_AUTOPLUG_SRC =
-else
-GST_AUTOPLUG_SRC = helloworld2
-endif
-
 if GST_DISABLE_LOADSAVE
 GST_LOADSAVE_SRC =
 else
 GST_LOADSAVE_SRC = xml-mp3
 endif
 
-EXAMPLES = dynamic $(GNOME) helloworld $(GST_AUTOPLUG_SRC) queue threads $(GST_LOADSAVE_SRC)
+EXAMPLES = dynamic $(GNOME) helloworld queue threads $(GST_LOADSAVE_SRC)
 noinst_PROGRAMS = $(EXAMPLES)
 
 LDADD = $(GST_LIBS)
@@ -35,5 +29,5 @@ EXTRA_DIST = extract.pl
 # also, it's a bit irritating that right now a change in any xml file
 # triggers a rebuild of all examples
 #%.c:
-dynamic.c gnome.c helloworld.c helloworld2.c queue.c threads.c xml-mp3.c: $(top_srcdir)/docs/manual/*.xml
+dynamic.c gnome.c helloworld.c queue.c threads.c xml-mp3.c: $(top_srcdir)/docs/manual/*.xml
 	$(PERL_PATH) $(srcdir)/extract.pl $@ $(top_srcdir)/docs/manual/*.xml
diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c
index 3192922564..a529351e29 100644
--- a/tools/gst-inspect.c
+++ b/tools/gst-inspect.c
@@ -835,15 +835,6 @@ print_element_list (void)
         g_print ("%s:  %s: %s\n", plugin->desc.name,
                 GST_PLUGIN_FEATURE_NAME (factory) ,factory->details.longname);
       }
-#ifndef GST_DISABLE_AUTOPLUG
-      else if (GST_IS_AUTOPLUG_FACTORY (feature)) {
-        GstAutoplugFactory *factory;
-
-        factory = GST_AUTOPLUG_FACTORY (feature);
-        g_print ("%s:  %s: %s\n", plugin->desc.name,
-                GST_PLUGIN_FEATURE_NAME (factory), factory->longdesc);
-      }
-#endif
 #ifndef GST_DISABLE_INDEX
       else if (GST_IS_INDEX_FACTORY (feature)) {
         GstIndexFactory *factory;
@@ -891,7 +882,6 @@ print_plugin_info (GstPlugin *plugin)
   GList *features;
   gint num_features = 0;
   gint num_elements = 0;
-  gint num_autoplug = 0;
   gint num_types = 0;
   gint num_schedulers = 0;
   gint num_indexes = 0;
@@ -923,15 +913,6 @@ print_plugin_info (GstPlugin *plugin)
               factory->details.longname);
       num_elements++;
     }
-#ifndef GST_DISABLE_AUTOPLUG
-    else if (GST_IS_AUTOPLUG_FACTORY (feature)) {
-      GstAutoplugFactory *factory;
-
-      factory = GST_AUTOPLUG_FACTORY (feature);
-      g_print ("  %s: %s\n", GST_OBJECT_NAME (factory), factory->longdesc);
-      num_autoplug++;
-    }
-#endif
 #ifndef GST_DISABLE_INDEX
     else if (GST_IS_INDEX_FACTORY (feature)) {
       GstIndexFactory *factory;
@@ -975,8 +956,6 @@ print_plugin_info (GstPlugin *plugin)
   g_print ("\n  %d features:\n", num_features);
   if (num_elements > 0)
     g_print ("  +-- %d elements\n", num_elements);
-  if (num_autoplug > 0)
-    g_print ("  +-- %d autopluggers\n", num_autoplug);
   if (num_types > 0)
     g_print ("  +-- %d types\n", num_types);
   if (num_schedulers > 0)
@@ -1045,14 +1024,6 @@ main (int argc, char *argv[])
            g_print ("%s: an index\n", argv[1]);
            return 0;
          }
-#endif
-#ifndef GST_DISABLE_AUTOPLUG
-         feature = gst_registry_pool_find_feature (argv[1],
-                                                   GST_TYPE_AUTOPLUG_FACTORY);
-         if (feature) {
-           g_print ("%s: an autoplugger\n", argv[1]);
-           return 0;
-         }
 #endif
          feature = gst_registry_pool_find_feature (argv[1],
                                                    GST_TYPE_TYPE_FIND_FACTORY);
diff --git a/tools/gst-xmlinspect.c b/tools/gst-xmlinspect.c
index 3467e58029..0405d2f3d2 100644
--- a/tools/gst-xmlinspect.c
+++ b/tools/gst-xmlinspect.c
@@ -828,15 +828,6 @@ print_element_list (void)
         g_print ("%s:  %s: %s\n", plugin->desc.name,
                 GST_PLUGIN_FEATURE_NAME (factory) ,factory->details.longname);
       }
-#ifndef GST_DISABLE_AUTOPLUG
-      else if (GST_IS_AUTOPLUG_FACTORY (feature)) {
-        GstAutoplugFactory *factory;
-
-        factory = GST_AUTOPLUG_FACTORY (feature);
-        g_print ("%s:  %s: %s\n", plugin->desc.name,
-                GST_PLUGIN_FEATURE_NAME (factory), factory->longdesc);
-      }
-#endif
 #ifndef GST_DISABLE_INDEX
       else if (GST_IS_INDEX_FACTORY (feature)) {
         GstIndexFactory *factory;
@@ -916,15 +907,6 @@ print_plugin_info (GstPlugin *plugin)
               factory->details.longname);
       num_elements++;
     }
-#ifndef GST_DISABLE_AUTOPLUG
-    else if (GST_IS_AUTOPLUG_FACTORY (feature)) {
-      GstAutoplugFactory *factory;
-
-      factory = GST_AUTOPLUG_FACTORY (feature);
-      g_print ("  %s: %s\n", GST_OBJECT_NAME (factory), factory->longdesc);
-      num_autoplug++;
-    }
-#endif
 #ifndef GST_DISABLE_INDEX
     else if (GST_IS_INDEX_FACTORY (feature)) {
       GstIndexFactory *factory;
@@ -1042,14 +1024,6 @@ main (int argc, char *argv[])
            g_print ("%s: an index\n", argv[1]);
            return 0;
          }
-#endif
-#ifndef GST_DISABLE_AUTOPLUG
-         feature = gst_registry_pool_find_feature (argv[1],
-                                                   GST_TYPE_AUTOPLUG_FACTORY);
-         if (feature) {
-           g_print ("%s: an autoplugger\n", argv[1]);
-           return 0;
-         }
 #endif
          feature = gst_registry_pool_find_feature (argv[1],
                                                    GST_TYPE_TYPE_FIND_FACTORY);