diff --git a/choco_repack.py b/choco_repack.py
index 2b3cf97..095d579 100644
--- a/choco_repack.py
+++ b/choco_repack.py
@@ -84,7 +84,7 @@ def prepare_pack(pkg_dir, save_to):
                                         print('Download failed: {}'.format(url.geturl()))
                                         raise e
                                 out_file.write(line.replace(re_result[0], \
-                                        os.path.join(download_dir, filename)))
+                                        '\'' + os.path.join(download_dir, filename) + '\'' ))
                         else:
                             out_file.write(line)
                 shutil.move(os.path.join(tools_dir, 'tmp.ps1'), os.path.join(tools_dir, fn))
@@ -93,7 +93,7 @@ def prepare_pack(pkg_dir, save_to):
 
 def do_pack(pkg_dir, save_to):
     pkg_name, pkg_version, pkg_dependencies = read_nuspec(pkg_dir)
-    pack_cmd = 'choco pack {pkg_dir}\\{pkg_name}.nuspec --out {output_dir}'.format(
+    pack_cmd = 'choco pack {pkg_dir}\\{pkg_name}.nuspec --outputdirectory "{output_dir}"'.format(
             pkg_dir=pkg_dir, pkg_name=pkg_name, output_dir=save_to)
     #print('Execute command: {}'.format(pack_cmd))
     exec_result = subprocess.call(pack_cmd)