diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6574edfbd..33a536f1e 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (keyserver_spawn): Fix keyserver options on tempfile
+	only platforms.  Noted by Roger Sondermann.
+
 2004-05-20  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.c (keyserver_work): Allow --refresh-keys with a
diff --git a/g10/keyserver.c b/g10/keyserver.c
index c36ac6004..4beeb8d9f 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -744,7 +744,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
   assert(keyserver);
 
 #ifdef EXEC_TEMPFILE_ONLY
-  opt.keyserver_options.use_temp_files=1;
+  opt.keyserver_options.options|=KEYSERVER_USE_TEMP_FILES;
 #endif
 
   /* Push the libexecdir into path.  If DISABLE_KEYSERVER_PATH is set,