diff -ru aqbanking-2.1.0/aqbanking-config.in.in aqbanking-2.1.0.fixed/aqbanking-config.in.in
--- aqbanking-2.1.0/aqbanking-config.in.in	2006-04-03 15:30:43.000000000 -0400
+++ aqbanking-2.1.0.fixed/aqbanking-config.in.in	2006-07-14 17:08:28.000000000 -0400
@@ -10,19 +10,19 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @aqbanking_includes@ @gwenhywfar_includes@"
+	    result="$result $(pkg-config --cflags aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @aqbanking_ldflags@ @aqbanking_libs@"
+	    result="$result $(pkg-config --libs aqbanking)"
 	    ;;
 	--libraries++)
-	    result="$result @aqbanking_ldflags@ @aqbanking_libspp@"
+	    result="$result $(pkg-config --variable=librariespp aqbanking)"
 	    ;;
 	--plugins)
-	    result="$result @aqbanking_plugindir@"
+	    result="$result $(pkg-config --variable=plugindir aqbanking)"
 	    ;;
 	--data)
-	    result="$result @aqbanking_pkgdatadir@"
+	    result="$result $(pkg-conifg --variable=pkgdatadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @AQBANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/cbanking/cbanking-config.in.in
--- aqbanking-2.1.0/src/frontends/cbanking/cbanking-config.in.in	2006-04-03 15:30:32.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/cbanking/cbanking-config.in.in	2006-07-14 17:00:24.000000000 -0400
@@ -11,13 +11,13 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @all_includes@ @cbanking_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=cbanking_includes aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @cbanking_libs@"
+	    result="$result $(pkg-config --variable=cbanking_libs aqbanking)"
 	    ;;
 	--data)
-	    result="$result @cbanking_data@"
+	    result="$result $(pkg-config --variable=cbanking_datadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @CBANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in aqbanking-2.1.0.fixed/src/frontends/g2banking/g2banking-config.in.in
--- aqbanking-2.1.0/src/frontends/g2banking/g2banking-config.in.in	2006-04-03 15:30:23.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/g2banking/g2banking-config.in.in	2006-07-14 17:08:00.000000000 -0400
@@ -11,13 +11,13 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @all_includes@ @g2banking_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=g2banking_includes aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @g2banking_libs@"
+	    result="$result $(pkg-config --variable=g2banking_libs aqbanking)"
 	    ;;
 	--data)
-	    result="$result @g2banking_data@"
+	    result="$result $(pkg-config --variable=g2banking_datadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @G2BANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/kbanking/kbanking-config.in.in
--- aqbanking-2.1.0/src/frontends/kbanking/kbanking-config.in.in	2006-04-03 15:30:24.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/kbanking/kbanking-config.in.in	2006-07-14 17:01:26.000000000 -0400
@@ -11,13 +11,13 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @all_includes@ @kbanking_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=kbanking_includes aqbanking)"
 	    ;;
 	--libraries)
-	    result="$result @kbanking_libs@"
+	    result="$result $(pkg-config --variable=kbanking_libs aqbanking)"
 	    ;;
 	--data)
-	    result="$result @kbanking_data@"
+	    result="$result $(pkg-config --variable=kbanking_datadir aqbanking)"
 	    ;;
 	--vmajor)
 	    result="$result @KBANKING_VERSION_MAJOR@"
diff -ru aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in aqbanking-2.1.0.fixed/src/frontends/qbanking/lib/qbanking-config.in.in
--- aqbanking-2.1.0/src/frontends/qbanking/lib/qbanking-config.in.in	2006-04-03 15:30:30.000000000 -0400
+++ aqbanking-2.1.0.fixed/src/frontends/qbanking/lib/qbanking-config.in.in	2006-07-14 17:07:03.000000000 -0400
@@ -11,19 +11,19 @@
 for d in $*; do
     case $d in
 	--includes)
-	    result="$result @qbanking_includes@ @aqbanking_includes@ @gwenhywfar_includes@ @qt3_includes@"
+	    result="$result $(pkg-config --cflags aqbanking) $(pkg-config --variable=qbanking_includes aqbanking) $(pkg-config --cflags gwenhywfar) $(pkg-config --cflags qt-mt)"
 	    ;;
 	--libraries)
-	    result="$result @qbanking_libs@"
+	    result="$result $(pkg-config --variable=qbanking_libs aqbanking)"
 	    ;;
 	--plugins)
-	    result="$result @qbanking_plugindir@"
+	    result="$result $(pkg-config --variable=aqbanking_plugindir)/frontends/qbanking"
 	    ;;
 	--data)
-	    result="$result @qbanking_data@"
+	    result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking"
 	    ;;
 	--helpdir)
-	    result="$result @qbanking_helpdir@"
+	    result="$result $(pkg-config --variable=pkgdatadir aqbanking)/frontends/qbanking/help"
 	    ;;
 	--vmajor)
 	    result="$result @QBANKING_VERSION_MAJOR@"