diff --git a/lib/player.js b/lib/player.js
index 6ac251d..d4b6882 100644
--- a/lib/player.js
+++ b/lib/player.js
@@ -1,6 +1,7 @@
 var groove = require('groove');
 var EventEmitter = require('events').EventEmitter;
 var util = require('util');
+var mkdirp = require('mkdirp');
 var fs = require('fs');
 var uuid = require('uuid');
 var path = require('path');
@@ -16,7 +17,6 @@ var safePath = require('./safe_path');
 var PassThrough = require('stream').PassThrough;
 var url = require('url');
 var superagent = require('superagent');
-var temp = require('temp').track();
 
 module.exports = Player;
 
@@ -382,6 +382,7 @@ Player.prototype.refreshFilesIndex = function(args, cb) {
     var dirEntry = self.getOrCreateDir(dirName, stat);
     if (fullDirPath === dirWithSlash) return; // ignore root search path
     var baseName = path.basename(dirName);
+    if (isFileIgnored(baseName)) return;
     var parentDirName = path.dirname(dirName);
     if (parentDirName === '.') parentDirName = '';
     var parentDirEntry = self.getOrCreateDir(parentDirName);
@@ -629,21 +630,43 @@ Player.prototype.importUrl = function(urlString, cb) {
   var self = this;
   cb = cb || logIfError;
 
-  var parsedUrl = url.parse(urlString);
-  var remoteFilename = path.basename(parsedUrl.pathname);
-  var req = superagent.get(urlString);
-  var ws = temp.createWriteStream({suffix: path.extname(urlString)});
-  req.pipe(ws);
-  ws.on('close', function(){
-    self.importFile(ws.path, remoteFilename, cleanAndCb);
-  });
-  ws.on('error', cleanAndCb);
-  req.on('error', cleanAndCb);
+  var tmpDir = path.join(self.musicDirectory, '.tmp');
+  var destPath = path.join(tmpDir, uuid() + path.extname(urlString));
 
-  function cleanAndCb(err, dbFile) {
-    temp.cleanup();
-    cb(err, dbFile);
-  }
+  mkdirp(tmpDir, function(err) {
+    if (err) return cb(err);
+
+    var parsedUrl = url.parse(urlString);
+    var remoteFilename = path.basename(parsedUrl.pathname);
+    var ws = fs.createWriteStream(destPath);
+    var calledCallback = false;
+    var req = superagent.get(urlString);
+    req.pipe(ws);
+    ws.on('close', function(){
+      if (calledCallback) return;
+      self.importFile(ws.path, remoteFilename, function(err, dbFile) {
+        if (err) {
+          cleanAndCb(err);
+        } else {
+          calledCallback = true;
+          cb(null, dbFile);
+        }
+      });
+    });
+    ws.on('error', cleanAndCb);
+    req.on('error', cleanAndCb);
+
+    function cleanAndCb(err) {
+      fs.unlink(destPath, function(err) {
+        if (err) {
+          console.warn("Unable to clean up temp file:", err.stack);
+        }
+      });
+      if (calledCallback) return;
+      calledCallback = true;
+      cb(err);
+    }
+  });
 
   function logIfError(err) {
     if (err) {
diff --git a/lib/safe_path.js b/lib/safe_path.js
index 449cfad..7e25ecd 100644
--- a/lib/safe_path.js
+++ b/lib/safe_path.js
@@ -6,5 +6,6 @@ function safePath(string) {
   string = string.replace(/[<>:"\/\\|?*%]/g, "_");
   string = string.substring(0, MAX_LEN);
   string = string.replace(/\.$/, "_");
+  string = string.replace(/^\./, "_");
   return string;
 }
diff --git a/package.json b/package.json
index 73ea5f2..9b0cc29 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "uuid": "~1.4.1",
     "music-library-index": "^1.1.0",
     "keese": "~1.0.0",
-    "temp": "~0.7.0",
     "ws": "~0.4.31",
     "jsondiffpatch": "~0.1.4",
     "connect-static": "^1.1.0",