diff --git a/nodejs-shelljs.spec b/nodejs-shelljs.spec
index 5d2bc3f..c832eff 100644
--- a/nodejs-shelljs.spec
+++ b/nodejs-shelljs.spec
@@ -6,11 +6,7 @@ Release:             1
 Summary:             Portable Unix shell commands for Node.js
 License:             BSD and MIT
 URL:                 http://github.com/arturadib/shelljs
-Source0:             http://registry.npmjs.org/shelljs/-/shelljs-%{version}.tgz
-#git clone http://github.com/arturadib/shelljs
-#cd shelljs
-#git archive --prefix="test/" --format=tar tags/v%{version}:test/ | bzip2 >  tests-%{version}.tar.bz2
-Source1:             tests-%{version}.tar.bz2
+Source0:             http://github.com/arturadib/shelljs/archive/v%{version}.tar.gz
 Patch0:              nodejs-shelljs_fix-tests.patch
 BuildArch:           noarch
 ExclusiveArch:       %{nodejs_arches} noarch
@@ -22,9 +18,8 @@ BuildRequires:       coffee-script npm(glob)
 %{summary}.
 
 %prep
-%setup -q -n package
-%setup -q -T -D -a 1 -n package
-%patch0 -p1
+%autosetup -n shelljs-%{version} -S git
+rm test/exec.js
 sed -i '1s/env //' bin/shjs
 %nodejs_fixdep glob
 
@@ -45,6 +40,7 @@ ln -sf %{nodejs_sitelib}/shelljs/bin/shjs \
 %check
 %nodejs_symlink_deps --check
 %{__nodejs} -e 'require("./")'
+
 %if 0%{?enable_tests}
 %__nodejs scripts/run-tests
 %else
diff --git a/shelljs-0.7.3.tgz b/shelljs-0.7.3.tgz
deleted file mode 100644
index f38b0b8..0000000
Binary files a/shelljs-0.7.3.tgz and /dev/null differ
diff --git a/tests-0.7.3.tar.bz2 b/tests-0.7.3.tar.bz2
deleted file mode 100644
index b175d68..0000000
Binary files a/tests-0.7.3.tar.bz2 and /dev/null differ
diff --git a/v0.7.3.tar.gz b/v0.7.3.tar.gz
new file mode 100644
index 0000000..4a700d4
Binary files /dev/null and b/v0.7.3.tar.gz differ