diff --git a/lib/modules/ipfs/upload.js b/lib/modules/ipfs/upload.js
index ea9432f30..25ed1025a 100644
--- a/lib/modules/ipfs/upload.js
+++ b/lib/modules/ipfs/upload.js
@@ -16,7 +16,7 @@ class IPFS {
     let self = this;
     async.waterfall([
       function findBinary(callback) {
-        let ipfs_bin = shelljs.exec('which ' + self.configIpfsBin).output.split("\n")[0];
+        let ipfs_bin = shelljs.which(self.configIpfsBin);
 
         if (ipfs_bin === 'ipfs not found' || ipfs_bin === '') {
           console.log(('=== WARNING: ' + self.configIpfsBin + ' not found or not in the path. Guessing ~/go/bin/ipfs for path').yellow);
@@ -26,7 +26,7 @@ class IPFS {
         return callback(null, ipfs_bin);
       },
       function runCommand(ipfs_bin, callback) {
-        let cmd = ipfs_bin + " add -r " + self.buildDir;
+        let cmd = `"${ipfs_bin}" add -r ${self.buildDir}`;
         console.log(("=== adding " + self.buildDir + " to ipfs").green);
         console.log(cmd.green);
         let result = shelljs.exec(cmd);