diff --git a/ChangeLog b/ChangeLog
index 9833bd4f12..f6d2b8f38a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-07  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* configure.ac:
+	* ext/Makefile.am:
+	* tests/check/Makefile.am:
+	Move gio plugin from -bad and mark as experimental.
+
 2008-02-07  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* gst-libs/gst/interfaces/mixeroptions.c:
diff --git a/configure.ac b/configure.ac
index 4188b60fd1..b69e8f5894 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,6 +129,7 @@ AC_SUBST(GST_PLUGINS_SELECTED)
 
 AG_GST_ARG_ENABLE_EXTERNAL
 
+AG_GST_ARG_ENABLE_EXPERIMENTAL
 dnl *** checks for platform ***
 
 dnl * hardware/architecture *
@@ -480,6 +481,18 @@ AG_GST_CHECK_FEATURE(GNOME_VFS, [GNOME VFS], gnomevfs, [
   AG_GST_PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0)
 ])
 
+dnl *** libgio ***
+USE_GIO=$BUILD_EXPERIMENTAL
+translit(dnm, m, l) AM_CONDITIONAL(USE_GIO, true)
+AG_GST_CHECK_FEATURE(GIO, [GIO library], gio, [
+  PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.15.2, HAVE_GIO="yes", [
+    HAVE_GIO="no"
+    AC_MSG_RESULT(no)
+  ])
+  AC_SUBST(GIO_CFLAGS)
+  AC_SUBST(GIO_LIBS)
+])
+
 dnl *** libvisual ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBVISUAL, true)
 AG_GST_CHECK_FEATURE(LIBVISUAL, [libvisual visualization library], libvisual, [
@@ -554,6 +567,7 @@ dnl but we still need to set the conditionals
 AM_CONDITIONAL(USE_ALSA, false)
 AM_CONDITIONAL(USE_CDPARANOIA, false)
 AM_CONDITIONAL(USE_GNOME_VFS, false)
+AM_CONDITIONAL(USE_GIO, false)
 AM_CONDITIONAL(USE_LIBVISUAL, false)
 AM_CONDITIONAL(USE_OGG, false)
 AM_CONDITIONAL(USE_PANGO, false)
@@ -663,6 +677,7 @@ ext/Makefile
 ext/alsa/Makefile
 ext/cdparanoia/Makefile
 ext/gnomevfs/Makefile
+ext/gio/Makefile
 ext/libvisual/Makefile
 ext/ogg/Makefile
 ext/pango/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index a9231e3618..9d13ac5ee5 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -10,6 +10,12 @@ else
 CDPARANOIA_DIR=
 endif
 
+if USE_GIO
+GIO_DIR=gio
+else
+GIO_DIR=
+endif
+
 if USE_GNOME_VFS
 GNOMEVFS_DIR=gnomevfs
 else
@@ -49,6 +55,7 @@ endif
 SUBDIRS = \
   $(ALSA_DIR) \
   $(CDPARANOIA_DIR) \
+  $(GIO_DIR) \
   $(GNOMEVFS_DIR) \
   $(LIBVISUAL_DIR) \
   $(OGG_DIR) \
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index c52546ebbc..e837282d55 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -37,6 +37,12 @@ else
 check_gnomevfs = 
 endif
 
+if USE_GIO
+check_gio = pipelines/gio
+else
+check_gio =
+endif
+
 if USE_LIBVISUAL
 check_libvisual = elements/libvisual
 else