diff --git a/g10/ChangeLog b/g10/ChangeLog
index 55add114d..281fb1534 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-11  Werner Koch  <wk@gnupg.org>
+
+	* keyserver.c (keyserver_export): Get confirmation before sending
+	all keys.
+
 2002-05-10  Stefan Bellon  <sbellon@sbellon.de>
 
 	* g10.c, hkp.c, keyedit.c, keyserver.c: Replaced all occurrances
diff --git a/g10/keyserver.c b/g10/keyserver.c
index c6e4ba4c6..716e974a2 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -640,6 +640,17 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,int count)
 int 
 keyserver_export(STRLIST users)
 {
+  /* We better ask for confirmation when the user entered --send-keys
+     without arguments.  Sending all keys might not be the thing he
+     intended to do */
+  if (users || opt.batch || opt.answer_yes)
+    ;
+  else if ( !cpr_get_answer_is_yes
+            ("keyserver_export.send_all",
+             _("Do you really want to send all your "
+               "public keys to the keyserver? (y/N) ")))
+    return -1;
+
   return keyserver_work(SEND,users,NULL,0);
 }