--- neon-0.25.5/neon.pc.in.multilib
+++ neon-0.25.5/neon.pc.in
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+has_lfs=@NE_FLAG_LFS@
 
 Name: neon
 Description: HTTP/WebDAV client library
--- neon-0.25.5/neon-config.in.multilib
+++ neon-0.25.5/neon-config.in
@@ -5,7 +5,11 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@
-libdir=@libdir@
+
+libdir=`pkg-config --variable=libdir neon`
+CFLAGS=`pkg-config --cflags neon`
+LIBS=`pkg-config --libs neon`
+has_lfs=`pkg-config --variable=has_lfs neon`
 
 usage()
 {
@@ -21,7 +25,7 @@
   --help		display this help and exit
   --version		output version information
   --support FEATURE     exit with success if feature is supported
- Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@]
+ Known features: dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}]
 
 EOF
 
@@ -66,11 +70,10 @@
 	;;
 
     --cflags)
-       	echo -I${includedir}/neon @NEON_CFLAGS@
+       	echo ${CFLAGS}
        	;;
 
     --libs)
-        LIBS="-lneon @NEON_LIBS@"
 	# Don't add standard library paths
         if test "$prefix" != "/usr"; then
            LIBS="-L${libdir} ${LIBS}"
@@ -90,7 +93,7 @@
 	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
 	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
 	dav|DAV) support @NE_FLAG_DAV@ ;;
-	lfs|LFS) support @NE_FLAG_LFS@ ;;
+	lfs|LFS) support ${has_lfs} ;;
 	*) support no ;;
 	esac
 	;;