--- dev86/bcc/bcc.c
+++ dev86/bcc/bcc.c
@@ -15,6 +15,7 @@
  *	-M9	MC6809 with bcc
  *	-M0	A framework for the -B option.
  */
+#define _GNU_SOURCE
 #include <stdio.h>
 #ifdef __STDC__
 #include <limits.h>
@@ -123,11 +123,7 @@ int file_count = 0;
 int dyn_count = 0;
 int error_count = 0;
 char * progname = "C";
-#ifdef MSDOS
 char * tmpdir = "";
-#else
-char * tmpdir = "/tmp/";
-#endif
 
 int main P((int argc, char **argv));
 
@@ -198,6 +194,18 @@ char ** argv;
    if ((temp = getenv("BCC_PREFIX")) != 0 )
       localprefix = copystr(temp);
 
+#ifndef MSDOS
+   /* XXX: this brings bcc behaviour in sync with the manual page which
+           states that bcc uses TMPDIR for the temporary directory name.
+           However, temporary file handling in this package is totally
+           insecure and I see no easy way how to fix it. :(
+                                                                -- (GM)
+    */
+   tmpdir = secure_getenv("TMPDIR");
+   if (!tmpdir || !*tmpdir)
+      tmpdir = "/tmp";
+#endif
+
    getargs(argc, argv);
    validate_link_opts();
 
@@ -731,9 +739,9 @@ int use_o;
    {
       char buf[16];
 #ifdef MSDOS
-      sprintf(buf, "$$%05d$", dyn_count++);
+      sprintf(buf, "/$$%05d$", dyn_count++);
 #else
-      sprintf(buf, "$$%04d%05d", dyn_count++, getpid());
+      sprintf(buf, "/$$%04d%05d", dyn_count++, getpid());
 #endif
       file->file = catstr(tmpdir, buf);
    }
@@ -754,9 +762,9 @@ run_unlink()
       char buf[16];
       char * p;
 #ifdef MSDOS
-      sprintf(buf, "$$%05d$", i);
+      sprintf(buf, "/$$%05d$", i);
 #else
-      sprintf(buf, "$$%04d%05d", i, getpid());
+      sprintf(buf, "/$$%04d%05d", i, getpid());
 #endif
       p = catstr(tmpdir, buf);
       if (opt_v>1)