diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 9be8f3f7..58669e7e 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-03  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme-config.in: Use $libdir, not @libdir@, for the echo
+	command.
+
 	* gpgme-config.in: Rewritten.
 	* gpgme.m4: Rewritten.
 
diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in
index 4e428db0..b21013e9 100644
--- a/gpgme/gpgme-config.in
+++ b/gpgme/gpgme-config.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-#    Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -36,12 +36,12 @@ usage()
     cat <<EOF
 Usage: gpgme-config [OPTIONS]
 Options:
+	[--thread={${thread_modules}}]
 	[--prefix]
 	[--exec-prefix]
 	[--version]
 	[--libs]
 	[--cflags]
-	[--thread={${thread_modules}}]
 EOF
     exit $1
 }
@@ -84,7 +84,7 @@ while test $# -gt 0; do
 	    output="$output $gpg_error_cflags"
 	    ;;
 	--libs)
-            output="$output -L@libdir@"
+            output="$output -L$libdir"
 	    case "$thread_module" in
 		pthread)
 	            output="$output -lgpgme-pthread $libs_pthread"