diff --git a/g10/ChangeLog b/g10/ChangeLog
index b5ac0b6e4..a99febc24 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-14  Stefan Bellon  <sbellon@sbellon.de>
+
+	* exec.c (make_tempdir): Make use of EXTSEP_S instead of hardcoded
+	dot as extension separator.
+
 2002-05-13  David Shaw  <dshaw@jabberwocky.com>
 
 	* photoid.c (show_photos): Use the long keyid as the filename for
diff --git a/g10/exec.c b/g10/exec.c
index 520aef908..144a255d8 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -64,7 +64,7 @@ static int make_tempdir(struct exec_info *info)
   char *tmp=opt.temp_dir,*name=info->name;
 
   if(!name)
-    name=info->binary?"tempfile.bin":"tempfile.txt";
+    name=info->binary?"tempfile" EXTSEP_S "bin":"tempfile" EXTSEP_S "txt";
 
   /* Make up the temp dir and files in case we need them */