diff --git a/3.0.0.tar.gz b/3.0.0.tar.gz
new file mode 100644
index 0000000..3156d87
Binary files /dev/null and b/3.0.0.tar.gz differ
diff --git a/nodejs-with.spec b/nodejs-with.spec
index a64acd9..1b225b1 100644
--- a/nodejs-with.spec
+++ b/nodejs-with.spec
@@ -8,16 +8,9 @@ Release:             1
 Summary:             Compile time `with` for strict mode JavaScript
 License:             MIT
 URL:                 https://github.com/ForbesLindesay/with
-Source0:             http://registry.npmjs.org/with/-/with-%{version}.tgz
-#git clone git://github.com/ForbesLindesay/with.git
-#cd with
-#git archive --prefix="test/" --format=tar tags/${tag}:test/ \
-#    | bzip2 > "$pwd"/tests-${tag}.tar.bz2
-Source1:             tests-%{version}.tar.bz2
-
+Source0:             https://github.com/ForbesLindesay/with/archive/%{version}.tar.gz
 BuildArch:           noarch
 ExclusiveArch:       %{nodejs_arches} noarch
-
 BuildRequires:       nodejs-packaging
 
 %if 0%{?enable_tests}
@@ -28,12 +21,11 @@ BuildRequires:       mocha uglify-js
 %{summary}.
 
 %prep
-%setup -q -n package
+%autosetup -n with-%{version}
 find . -type f -exec chmod -x '{}' \;
 for i in LICENSE README.md; do
     sed -i -e 's/\r$//' "${i}"
 done
-%setup -q -T -D -a 1 -n package
 
 %nodejs_fixdep uglify-js '^2.2'
 
diff --git a/tests-3.0.0.tar.bz2 b/tests-3.0.0.tar.bz2
deleted file mode 100644
index 377a212..0000000
Binary files a/tests-3.0.0.tar.bz2 and /dev/null differ
diff --git a/with-3.0.0.tgz b/with-3.0.0.tgz
deleted file mode 100644
index ddca61f..0000000
Binary files a/with-3.0.0.tgz and /dev/null differ