1 files changed, 8 insertions, 2 deletions
diff --git a/lib/System/Unix/Path.inc b/lib/System/Unix/Path.inc
index 1de594b866..a0def8d512 100644
--- a/lib/System/Unix/Path.inc
+++ b/lib/System/Unix/Path.inc
@@ -746,8 +746,14 @@ Path::makeUnique(bool reuse_current, std::string* ErrMsg) {
   // Append an XXXXXX pattern to the end of the file for use with mkstemp, 
   // mktemp or our own implementation.
   char *FNBuffer = (char*) alloca(path.size()+8);
-  path.copy(FNBuffer,path.size());
-  strcpy(FNBuffer+path.size(), "-XXXXXX");
+  if (isDirectory()) {
+    std::string dirPath = getDirname();
+    strcpy(FNBuffer, dirPath.c_str());
+    strcpy(FNBuffer+dirPath.size(), "XXXXXX");
+  } else {
+    path.copy(FNBuffer,path.size());
+    strcpy(FNBuffer+path.size(), "-XXXXXX");
+  }
 
 #if defined(HAVE_MKSTEMP)
   int TempFD;