diff --git a/ChangeLog b/ChangeLog
index 3478ec3b..f351395e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac (GPGME_CONFIG_API_VERSION): New variable,
+	substitute it.
+
 2004-04-29  Marcus Brinkmann  <marcus@g10code.de>
 
 	Released 0.4.7.
diff --git a/configure.ac b/configure.ac
index 2f887249..141e2305 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,10 @@ LIBGPGME_LT_CURRENT=13
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
 LIBGPGME_LT_AGE=2
 LIBGPGME_LT_REVISION=2
+
+# If the API is changed in an incompatible way: increment the next counter.
+GPGME_CONFIG_API_VERSION=1
+
 NEED_GPG_VERSION=1.2.2
 NEED_GPGSM_VERSION=1.9.6
 ##############################################
@@ -309,6 +313,7 @@ GNUPG_FIX_HDR_VERSION(gpgme/gpgme.h, GPGME_VERSION)
 # Substitution used for gpgme-config 
 GPGME_CONFIG_LIBS="-lgpgme"
 GPGME_CONFIG_CFLAGS=""
+AC_SUBST(GPGME_CONFIG_API_VERSION)
 AC_SUBST(GPGME_CONFIG_LIBS)
 AC_SUBST(GPGME_CONFIG_CFLAGS)
 
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 42aba9ee..1aa370f7 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,7 @@
 2004-05-21  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme-config.in (Options): Support --api-version.
+
 	* libgpgme.vers: List all gpgme symbols under version GPGME_1.0.
 
 	* decrypt.c (_gpgme_decrypt_status_handler): Fix last change.
diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in
index 28f14483..81e599d9 100644
--- a/gpgme/gpgme-config.in
+++ b/gpgme/gpgme-config.in
@@ -40,6 +40,7 @@ Options:
 	[--prefix]
 	[--exec-prefix]
 	[--version]
+        [--api-version]
 	[--libs]
 	[--cflags]
 EOF
@@ -77,6 +78,10 @@ while test $# -gt 0; do
             echo "@VERSION@"
 	    exit 0
 	    ;;
+        --api-version)
+	    echo "@GPGME_CONFIG_API_VERSION@"
+	    exit 0
+	    ;;
         --cflags)
 	    if test "x$includedir" != "x/usr/include" -a "x$includedir" != "x/include"; then
 		output="$output -I$includedir"