diff --git a/ChangeLog b/ChangeLog
index 5a6e4be..4a1f5e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-21  Tollef Fog Heen  <tfheen@err.no>
+
+	* pkg.m4: Apply patch from Roberto Huelga to look at XXX_CFLAGS
+	and XXX_LIBS which got lost somewhere.
+
 2005-08-27  Tollef Fog Heen  <tfheen@err.no>
 
 	* Makefile.am (AM_CFLAGS): Add default CFLAGS
diff --git a/pkg.m4 b/pkg.m4
index 6c35916..3c20213 100644
--- a/pkg.m4
+++ b/pkg.m4
@@ -67,9 +67,13 @@ fi])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
 [if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
         PKG_CHECK_EXISTS([$3],
                          [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 			 [pkg_failed=yes])
+    fi
 else
 	pkg_failed=untried
 fi[]dnl