diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index a483650e..352aa986 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-23  Marcus Brinkmann  <marcus@g10code.de>
+
+	* gpgme-config.in (gpg_error_libs): Quote GPG_ERROR_CFLAGS and
+	GPG_ERROR_LIBS when setting the corresponding variables.
+	Reported by Stéphane Corthésy.
+
 2003-07-22  Marcus Brinkmann  <marcus@g10code.de>
 
 	* engine-gpgsm.c (set_recipients): Move declaration of NEWLEN to
diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in
index fb7a6d70..abb6a179 100644
--- a/gpgme/gpgme-config.in
+++ b/gpgme/gpgme-config.in
@@ -22,8 +22,8 @@ echo_cflags=no
 echo_prefix=no
 echo_exec_prefix=no
 
-gpg_error_cflags=@GPG_ERROR_CFLAGS@
-gpg_error_libs=@GPG_ERROR_LIBS@
+gpg_error_cflags="@GPG_ERROR_CFLAGS@"
+gpg_error_libs="@GPG_ERROR_LIBS@"
 
 
 usage()