diff --git a/configure.ac b/configure.ac
index 80b852080a..365fcfb40b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,7 +245,6 @@ if test "x$HAVE_GTK_22" = "xyes"; then
   GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
   AC_SUBST(GTK_VERSION)
   GTK_PREFIX=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
-  GTK_SYSCONFDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
   GDK_PIXBUF_LIBDIR=`$PKG_CONFIG --variable=libdir gdk-pixbuf-2.0`
   GDK_PIXBUF_PREFIXDIR=`$PKG_CONFIG --variable=prefix gdk-pixbuf-2.0`
   AC_SUBST(GTK_BASE_DIR)
@@ -279,20 +278,31 @@ AC_ARG_WITH(gdk-pixbuf-loader-dir,
    # nothing specified
    GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
 )
-
 AS_AC_EXPAND(GDK_PIXBUF_LOADER_DIR, $GDK_PIXBUF_LOADER_DIR)
 AC_SUBST(GDK_PIXBUF_LOADER_DIR)
 AC_MSG_NOTICE([Putting GTK+-2 pixbuf loaders in $GDK_PIXBUF_LOADER_DIR])
 
-GDK_PIXBUF_CONFDIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
-AC_ARG_WITH(gdk-pixbuf-conffile, 
+# allow customization of pixbuf loader configuration file
+# when nothing specified, adhere to prefix settings
+# when called without any option with this argument, autodetect
+# when called with a path, set to the given path
+AC_ARG_WITH(gdk-pixbuf-conf-dir, 
    AC_HELP_STRING([--with-gdk-pixbuf-conf-dir],
-   	[path to the gdk_pixbuf config directory]),
-   [if test "x${withval}" != x ; then
-   	GDK_PIXBUF_CONFDIR="${withval}"
+   	[directory to install the gdk_pixbuf config (none for pkg-config default)]),
+   [
+    if test "x${withval}" != xyes ; then
+      GDK_PIXBUF_CONF_DIR="${withval}"
+    else
+      GDK_PIXBUF_CONF_DIR="$GDK_PIXBUF_PREFIXDIR/etc/gtk-2.0/"
     fi
-])
-AC_SUBST(GDK_PIXBUF_CONFDIR)
+   ],
+   # nothing specified
+   GDK_PIXBUF_LOADER_DIR=${libdir}/gtk-2.0/\$GTK_VERSION/loaders
+   GDK_PIXBUF_CONF_DIR=${sysconfdir}/gtk-2.0
+)
+AS_AC_EXPAND(GDK_PIXBUF_CONF_DIR, $GDK_PIXBUF_CONF_DIR)
+AC_SUBST(GDK_PIXBUF_CONF_DIR)
+AC_MSG_NOTICE([Putting GTK+-2 pixbuf loader config in $GDK_PIXBUF_CONF_DIR])
 
 dnl ===========================================================================
 dnl ============================= gst plug-ins ================================
@@ -1514,6 +1524,7 @@ gst-libs/gst/play/Makefile
 gst-libs/gst/propertyprobe/Makefile
 gst-libs/gst/resample/Makefile
 gst-libs/gst/riff/Makefile
+gst-libs/gst/tag/Makefile
 gst-libs/gst/tuner/Makefile
 gst-libs/gst/video/Makefile
 gst-libs/gst/xoverlay/Makefile
diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 9cb04feac4..c54b55fefe 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -15,13 +15,13 @@ endif
 SUBDIRS = audio colorbalance floatcast \
 		$(GCONF_DIR) idct media-info \
 		mixer navigation play propertyprobe \
-		resample riff tuner video \
+		resample riff tag tuner video \
 		$(X_DIR)
 
 DIST_SUBDIRS = audio colorbalance floatcast \
 		gconf idct media-info \
 		mixer navigation play propertyprobe \
-		resample riff tuner video \
+		resample riff tag tuner video \
 		xoverlay xwindowlistener
 
 
diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am
new file mode 100644
index 0000000000..002d6ffbfa
--- /dev/null
+++ b/gst-libs/gst/tag/Makefile.am
@@ -0,0 +1,5 @@
+libgsttagincludedir = \
+	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tag
+
+libgsttaginclude_HEADERS = \
+	tag.h
diff --git a/gst/tags/gsttagediting.h b/gst-libs/gst/tag/tag.h
similarity index 95%
rename from gst/tags/gsttagediting.h
rename to gst-libs/gst/tag/tag.h
index 7bf968eb29..24d3a2d3bf 100644
--- a/gst/tags/gsttagediting.h
+++ b/gst-libs/gst/tag/tag.h
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef __GST_TAG_EDITING_H__
-#define __GST_TAG_EDITING_H__
+#ifndef __GST_TAG_H__
+#define __GST_TAG_H__
 
 #include <gst/gst.h>
 
@@ -59,4 +59,4 @@ G_CONST_RETURN gchar *	gst_tag_to_id3_tag			(const gchar *		gst_tag);
 
 G_END_DECLS
 
-#endif /* __GST_TAG_EDITING_H__ */
+#endif /* __GST_TAG_H__ */
diff --git a/gst/tags/Makefile.am b/gst/tags/Makefile.am
index 2cb6f592d1..718d75551e 100644
--- a/gst/tags/Makefile.am
+++ b/gst/tags/Makefile.am
@@ -6,8 +6,5 @@ libgsttagediting_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/tags
 libgsttagediting_la_LIBADD = $(GST_LIBS) 
 libgsttagediting_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-libgsttageditingincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tags
-libgsttageditinginclude_HEADERS = gsttagediting.h
-
 noinst_HEADERS = gsttageditingprivate.h
 
diff --git a/gst/tags/gstid3tag.c b/gst/tags/gstid3tag.c
index 0c410fabc9..83c015073a 100644
--- a/gst/tags/gstid3tag.c
+++ b/gst/tags/gstid3tag.c
@@ -1,7 +1,7 @@
 /* GStreamer
  * Copyright (C) 2003 Benjamin Otte <in7y118@public.uni-hamburg.de>
  *
- * gstvorbistagsetter.c: plugin for reading / modifying vorbis tags
+ * gstid3tag.c: plugin for reading / modifying id3 tags
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/gst/tags/gsttageditingprivate.h b/gst/tags/gsttageditingprivate.h
index 6d15fece7c..f7d9e95c33 100644
--- a/gst/tags/gsttageditingprivate.h
+++ b/gst/tags/gsttageditingprivate.h
@@ -21,7 +21,7 @@
 #ifndef __GST_OGG_PLUGINS_H__
 #define __GST_OGG_PLUGINS_H__
 
-#include "gsttagediting.h"
+#include <gst/tag/tag.h>
 
 G_BEGIN_DECLS