2 files changed, 6 insertions, 0 deletions
diff --git a/gnu/usr.bin/lynx/src/LYClean.c b/gnu/usr.bin/lynx/src/LYClean.c
index 34961766ba0..82714231530 100644
--- a/gnu/usr.bin/lynx/src/LYClean.c
+++ b/gnu/usr.bin/lynx/src/LYClean.c
@@ -138,6 +138,10 @@ PUBLIC void cleanup_sig ARGS1(
 PUBLIC void cleanup_files NOARGS
 {
     LYCleanupTemp();
+
+    if (rmdir(lynx_temp_space))
+	perror("Could not remove the temp-directory");
+
     FREE(lynx_temp_space);
 }
 
diff --git a/gnu/usr.bin/lynx/src/LYMain.c b/gnu/usr.bin/lynx/src/LYMain.c
index 9f1f717e83a..abfb2f3520d 100644
--- a/gnu/usr.bin/lynx/src/LYMain.c
+++ b/gnu/usr.bin/lynx/src/LYMain.c
@@ -861,6 +861,8 @@ PUBLIC int main ARGS2(
 	    FREE(temp);
 	}
     }
+    StrAllocCat(lynx_temp_space, "/lynx-XXXXXX");
+    lynx_temp_space = mkdtemp(lynx_temp_space);
 #ifdef VMS
     LYLowerCase(lynx_temp_space);
     if (strchr(lynx_temp_space, '/') != NULL) {