diff --git a/package.json b/package.json
index 5c55b29a4e..0c1d4d33b5 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
     "p-limit": "^1.1.0",
     "path-absolute": "^1.0.0",
     "path-exists": "^3.0.0",
+    "path-temp": "^1.0.0",
     "ramda": "^0.25.0",
     "rename-overwrite": "^1.0.0",
     "rimraf-then": "^1.0.1",
diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml
index 4f355f7c4e..4f10fc0137 100644
--- a/shrinkwrap.yaml
+++ b/shrinkwrap.yaml
@@ -19,6 +19,7 @@ dependencies:
   p-limit: 1.2.0
   path-absolute: 1.0.0
   path-exists: 3.0.0
+  path-temp: 1.0.0
   ramda: 0.25.0
   rename-overwrite: 1.0.2
   rimraf-then: 1.0.1
@@ -531,6 +532,12 @@ packages:
       node: '>=4.8'
     resolution:
       integrity: sha512-LDYnK41m8td+nBTk5Jmn55aGVP18iYuUqoM1X3u+ptt7M/g9FPS8C38PNoJTMfjoNx4fmiwWToPpiZklGRLbIA==
+  /crypto-random-string/1.0.0:
+    dev: false
+    engines:
+      node: '>=4'
+    resolution:
+      integrity: sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=
   /currently-unhandled/0.4.1:
     dependencies:
       array-find-index: 1.0.2
@@ -1943,6 +1950,14 @@ packages:
     dev: true
     resolution:
       integrity: sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=
+  /path-temp/1.0.0:
+    dependencies:
+      unique-string: 1.0.0
+    dev: false
+    engines:
+      node: '>=4'
+    resolution:
+      integrity: sha512-TeQgoH67RYUT3xt6WaRASbWyJmvrUnpeToQQT7RW+uighCh/gfs4VCO2/P8mIpjt6JsyJ6DxE6Q1FOJXVc3ANg==
   /path-type/1.1.0:
     dependencies:
       graceful-fs: 4.1.11
@@ -2656,6 +2671,14 @@ packages:
     dev: true
     resolution:
       integrity: sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==
+  /unique-string/1.0.0:
+    dependencies:
+      crypto-random-string: 1.0.0
+    dev: false
+    engines:
+      node: '>=4'
+    resolution:
+      integrity: sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=
   /universalify/0.1.1:
     dev: true
     resolution:
@@ -2802,6 +2825,7 @@ specifiers:
   package-preview: ^1.0.0
   path-absolute: ^1.0.0
   path-exists: ^3.0.0
+  path-temp: ^1.0.0
   ramda: ^0.25.0
   rename-overwrite: ^1.0.0
   rimraf: ^2.6.1
diff --git a/src/fs/linkIndexedDir.ts b/src/fs/linkIndexedDir.ts
index d9a2d452b8..3731cdf4c5 100644
--- a/src/fs/linkIndexedDir.ts
+++ b/src/fs/linkIndexedDir.ts
@@ -1,10 +1,11 @@
 import mkdirp = require('mkdirp-promise')
 import fs = require('mz/fs')
 import path = require('path')
+import pathTemp = require('path-temp')
 import rimraf = require('rimraf-then')
 
 export default async function linkIndexedDir (existingDir: string, newDir: string, filenames: string[]) {
-  const stage = `${newDir}+stage${Math.random()}`
+  const stage = pathTemp(path.dirname(newDir))
   try {
     await rimraf(stage)
     await tryLinkIndexedDir(existingDir, stage, filenames)
diff --git a/src/storeController/createImportPackage.ts b/src/storeController/createImportPackage.ts
index 4cb65affed..1713a0745c 100644
--- a/src/storeController/createImportPackage.ts
+++ b/src/storeController/createImportPackage.ts
@@ -9,6 +9,7 @@ import ncpCB = require('ncp')
 import pLimit = require('p-limit')
 import path = require('path')
 import exists = require('path-exists')
+import pathTemp = require('path-temp')
 import renameOverwrite = require('rename-overwrite')
 import promisify = require('util.promisify')
 import linkIndexedDir from '../fs/linkIndexedDir'
@@ -84,7 +85,7 @@ async function reflinkPkg (
   const pkgJsonPath = path.join(to, 'package.json')
 
   if (!opts.filesResponse.fromStore || opts.force || !await exists(pkgJsonPath)) {
-    const staging = `${to}+stage${Math.random()}`
+    const staging = pathTemp(path.dirname(to))
     await mkdirp(staging)
     await execFilePromise('cp', ['-r', '--reflink', from + '/.', staging])
     await renameOverwrite(staging, to)
@@ -132,7 +133,7 @@ export async function copyPkg (
 ) {
   const pkgJsonPath = path.join(to, 'package.json')
   if (!opts.filesResponse.fromStore || opts.force || !await exists(pkgJsonPath)) {
-    const staging = `${to}+stage${Math.random()}`
+    const staging = pathTemp(path.dirname(to))
     await mkdirp(staging)
     await ncp(from + '/.', staging)
     await renameOverwrite(staging, to)