diff --git a/ChangeLog b/ChangeLog
index 9a89fcf53..09ad844cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-03  David Shaw  <dshaw@jabberwocky.com>
+
+	* configure.ac: Give warning when using capabilities.
+
 2004-07-26  Werner Koch  <wk@g10code.de>
 
 	Released 1.2.5.
diff --git a/configure.ac b/configure.ac
index 2ce585c1c..e1227ab26 100644
--- a/configure.ac
+++ b/configure.ac
@@ -687,6 +687,12 @@ dnl
 dnl Check whether we can use Linux capabilities as requested
 dnl
 if test "$use_capabilities" = "yes" ; then
+
+AC_MSG_WARN([[
+***
+*** WARNING: using capabilities with GnuPG is experimental code!
+***]])
+
 use_capabilities=no
 AC_CHECK_HEADERS(sys/capability.h)
 if test "$ac_cv_header_sys_capability_h" = "yes" ; then