diff --git a/ChangeLog b/ChangeLog
index a6a83350..a622c64e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-10-12  Marcus Brinkmann  <marcus@g10code.de>
+
+	* configure.ac: Add automake conditional HAVE_GPGSM.
+
 2002-10-08  Marcus Brinkmann  <marcus@g10code.de>
 
 	* configure.ac (AC_INIT): Bump version up to 0.4.0.
diff --git a/configure.ac b/configure.ac
index 8c00143e..f7633d8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,6 +230,7 @@ else
   AC_DEFINE_UNQUOTED(GPGSM_PATH, "$GPGSM", [Path to the GPGSM binary.])
   AC_SUBST(GPGSM)
 fi
+AM_CONDITIONAL(HAVE_GPGSM, [test -n "$GPGSM" && test -r "$GPGSM"])
 AM_CONDITIONAL(RUN_GPGSM_TESTS,
   [test "$cross_compiling" != "yes" && test -n "$GPGSM" && test -r "$GPGSM"])