diff --git a/ChangeLog b/ChangeLog
index a2cb26f1e2..a768df7114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-02-11  David Schleef  <ds@schleef.org>
+
+	Convert a few inner loops to use liboil.  This is currently
+	optional, and is only enabled if liboil is present (duh!).
+	* configure.ac: Check for liboil-0.1
+	* gst/intfloat/Makefile.am:
+	* gst/intfloat/gstint2float.c: (conv_f32_s16), (scalarmult_f32),
+	(gst_int2float_chain_gint16):
+	* gst/videofilter/Makefile.am:
+	* gst/videofilter/gstvideobalance.c: (gst_videobalance_class_init),
+	(tablelookup_u8), (gst_videobalance_planar411):
+	* gst/videotestsrc/Makefile.am:
+	* gst/videotestsrc/gstvideotestsrc.c: (plugin_init):
+	* gst/videotestsrc/videotestsrc.c: (splat_u8), (paint_hline_YUY2),
+	(paint_hline_IYU2), (paint_hline_str4), (paint_hline_str3),
+	(paint_hline_RGB565), (paint_hline_xRGB1555):
+
 2004-02-11  David Schleef  <ds@schleef.org>
 
 	* ext/lcs/gstcolorspace.c: (colorspace_find_lcs_format),
diff --git a/configure.ac b/configure.ac
index db3448eacd..75bf8c713f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -337,6 +337,14 @@ if test "x$HAVE_GDK_LOADERS" == "xyes"; then
 fi
 AM_CONDITIONAL(HAVE_GDK_LOADERS, test "x$HAVE_GDK_LOADERS" = "xyes")
 
+PKG_CHECK_MODULES(LIBOIL, liboil-0.1, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
+AC_SUBST(LIBOIL_CFLAGS)
+AC_SUBST(LIBOIL_LIBS)
+if test "x${HAVE_LIBOIL}" = xyes ; then
+  #AC_DEFINE_UNQUOTED(HAVE_LIBOIL, 1, [Define if liboil is being used])
+  true
+fi
+
 dnl ===========================================================================
 dnl ============================= gst plug-ins ================================
 dnl ===========================================================================