diff -up gwenhywfar-3.4.1/gwenhywfar-config.in.in.pkgconfig gwenhywfar-3.4.1/gwenhywfar-config.in.in
--- gwenhywfar-3.4.1/gwenhywfar-config.in.in.pkgconfig	2008-07-31 13:56:05.000000000 -0400
+++ gwenhywfar-3.4.1/gwenhywfar-config.in.in	2008-09-09 11:25:23.000000000 -0400
@@ -1,31 +1,26 @@
 # $Id$
 # Author of this file: Martin Preuss<martin@libchipcard.de>
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
 bindir=@bindir@
 
-libdir=@libdir@
-
 result=""
 
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result -I@gwenhywfar_headerdir@"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--libraries)
-	    result="$result @gwenhywfar_ldflags@ @gwenhywfar_libs@"
+	    result="$result $(pkg-config --libs gwenhywfar)"
 	    ;;
 	--bindir)
 	    result="$result @gwenhywfar_bindir@"
 	    ;;
 	--headers)
-	    result="$result @gwenhywfar_headerdir@/gwenhywfar"
+	    result="$result $(pkg-config --cflags gwenhywfar)"
 	    ;;
 	--plugins)
-	    result="$result @gwenhywfar_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir gwenhywfar)"
 	    ;;
 	--vmajor)
 	    result="$result @GWENHYWFAR_VERSION_MAJOR@"
diff -up gwenhywfar-3.4.1/gwenhywfar.pc.in.pkgconfig gwenhywfar-3.4.1/gwenhywfar.pc.in
--- gwenhywfar-3.4.1/gwenhywfar.pc.in.pkgconfig	2008-07-31 13:56:05.000000000 -0400
+++ gwenhywfar-3.4.1/gwenhywfar.pc.in	2008-09-09 11:21:51.000000000 -0400
@@ -22,5 +22,4 @@ Description: A multi-platform helper lib
 
 Version: @VERSION@
 Libs: @gwenhywfar_ldflags@ @gwenhywfar_libs@
-Cflags: -I@gwenhywfar_headerdir@
-
+Cflags: -I@gwenhywfar_headerdir@ -I@libdir@/gwenhywfar/include