diff --git a/ChangeLog b/ChangeLog
index 788c7a6c16..8948ed783a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-05-13  Jan Schmidt  <thaytan@mad.scientist.com>
+	* configure.ac:
+	Add $GST_PKG_CFLAGS back into GST_INT_CFLAGS so I have large file
+	support until we decide where the flags should be used
+	* gst/elements/gstfilesrc.c: (gst_filesrc_srcpad_query):
+	Use GST_FORMAT_BYTES when GST_FORMAT_DEFAULT is passed
+	* gst/gstpad.c: (gst_pad_link_call_link_functions):
+	Output refused caps in the debug info
+
 2004-05-13  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/elements/gstidentity.c: (gst_identity_chain):
diff --git a/configure.ac b/configure.ac
index 9d91ab04d5..96794e6559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -566,7 +566,7 @@ dnl flags shared for all internal objects (core libs, elements, applications)
 dnl we disable deprecated internally
 dnl XML, GLib, popt, GST_INT, VALGRIND, and the right include for CFLAGS
 dnl no need to add XML, GLib, popt explicitly since libgstreamer pulls them in
-GST_INT_CFLAGS="$GLIB_CFLAGS $XML_CFLAGS \
+GST_INT_CFLAGS="$GLIB_CFLAGS $XML_CFLAGS $GST_PKG_CFLAGS \
  $GST_INT_CFLAGS $GST_ERROR_CFLAGS -DGST_DISABLE_DEPRECATED"
 
 dnl Private vars for libgst only
diff --git a/gst/elements/gstfilesrc.c b/gst/elements/gstfilesrc.c
index cb8321e64a..13774f7d7f 100644
--- a/gst/elements/gstfilesrc.c
+++ b/gst/elements/gstfilesrc.c
@@ -871,6 +871,9 @@ gst_filesrc_srcpad_query (GstPad * pad, GstQueryType type,
 {
   GstFileSrc *src = GST_FILESRC (GST_PAD_PARENT (pad));
 
+  if (*format == GST_FORMAT_DEFAULT)
+    *format = GST_FORMAT_BYTES;
+
   switch (type) {
     case GST_QUERY_TOTAL:
       if (*format != GST_FORMAT_BYTES) {
diff --git a/gst/gstpad.c b/gst/gstpad.c
index efb518c4e4..580b13ffea 100644
--- a/gst/gstpad.c
+++ b/gst/gstpad.c
@@ -1279,8 +1279,9 @@ gst_pad_link_call_link_functions (GstPadLink * link)
         res, GST_DEBUG_PAD_NAME (link->srcpad));
 
     if (GST_PAD_LINK_FAILED (res)) {
-      GST_CAT_INFO (GST_CAT_CAPS, "pad %s:%s doesn't accept caps",
-          GST_DEBUG_PAD_NAME (link->srcpad));
+      GST_CAT_INFO (GST_CAT_CAPS,
+          "pad %s:%s doesn't accept caps %" GST_PTR_FORMAT,
+          GST_DEBUG_PAD_NAME (link->srcpad), link->caps);
       return res;
     }
   }
@@ -1307,8 +1308,9 @@ gst_pad_link_call_link_functions (GstPadLink * link)
         res, GST_DEBUG_PAD_NAME (link->sinkpad));
 
     if (GST_PAD_LINK_FAILED (res)) {
-      GST_CAT_INFO (GST_CAT_CAPS, "pad %s:%s doesn't accept caps",
-          GST_DEBUG_PAD_NAME (link->sinkpad));
+      GST_CAT_INFO (GST_CAT_CAPS,
+          "pad %s:%s doesn't accept caps %" GST_PTR_FORMAT,
+          GST_DEBUG_PAD_NAME (link->sinkpad), link->caps);
       return res;
     }
   }
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index cb8321e64a..13774f7d7f 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -871,6 +871,9 @@ gst_filesrc_srcpad_query (GstPad * pad, GstQueryType type,
 {
   GstFileSrc *src = GST_FILESRC (GST_PAD_PARENT (pad));
 
+  if (*format == GST_FORMAT_DEFAULT)
+    *format = GST_FORMAT_BYTES;
+
   switch (type) {
     case GST_QUERY_TOTAL:
       if (*format != GST_FORMAT_BYTES) {