diff --git a/ChangeLog b/ChangeLog
index 894e994a6a..9445785639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-01  Stefan Kost  <ensonic@users.sf.net>
+
+	* plugins/indexers/gstindexers.c: (plugin_init):
+	conditionally register fileindexer (fixes #343598)
+
 2006-06-01  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/gsttagsetter.h:
diff --git a/plugins/indexers/gstindexers.c b/plugins/indexers/gstindexers.c
index 1bcb822142..0cfc603112 100644
--- a/plugins/indexers/gstindexers.c
+++ b/plugins/indexers/gstindexers.c
@@ -22,7 +22,10 @@
 #include <gst/gstplugin.h>
 
 extern gboolean gst_mem_index_plugin_init (GstPlugin * plugin);
+
+#ifndef GST_DISABLE_LOADSAVE
 extern gboolean gst_file_index_plugin_init (GstPlugin * plugin);
+#endif
 
 static gboolean
 plugin_init (GstPlugin * plugin)
@@ -30,7 +33,7 @@ plugin_init (GstPlugin * plugin)
   gboolean res = TRUE;
 
   res &= gst_mem_index_plugin_init (plugin);
-#ifdef HAVE_MMAP
+#if HAVE_MMAP && !GST_DISABLE_LOADSAVE
   res &= gst_file_index_plugin_init (plugin);
 #endif