diff --git a/commander-2.9.0.tgz b/commander-2.9.0.tgz
deleted file mode 100644
index a97e507..0000000
Binary files a/commander-2.9.0.tgz and /dev/null differ
diff --git a/examples-v2.9.0.tar.bz2 b/examples-v2.9.0.tar.bz2
deleted file mode 100644
index 620efc6..0000000
Binary files a/examples-v2.9.0.tar.bz2 and /dev/null differ
diff --git a/nodejs-commander.spec b/nodejs-commander.spec
index 0eefbcc..2b1e75c 100644
--- a/nodejs-commander.spec
+++ b/nodejs-commander.spec
@@ -5,15 +5,12 @@ Version:             2.9.0
 Release:             1
 Summary:             Node.js command-line interfaces made easy
 License:             MIT
-URL:                 https://github.com/tj/commander
-Source0:             https://registry.npmjs.org/commander/-/commander-%{version}.tgz
-Source1:             tests-v%{version}.tar.bz2
-Source2:             examples-v%{version}.tar.bz2
+URL:                 https://github.com/visionmedia/commander.js
+Source0:             https://github.com/visionmedia/commander.js/archive/v%{version}.tar.gz
 Source10:            dl-tests.sh
 Patch0:              nodejs-commander-2.9.0-Fix-engine-dep.patch
 BuildArch:           noarch
 ExclusiveArch:       %{nodejs_arches} noarch
-ExclusiveArch:       %{ix86} x86_64 %{arm} noarch
 BuildRequires:       nodejs-packaging
 %if 0%{?enable_tests}
 BuildRequires:       npm(should) npm(sinon) npm(graceful-readlink)
@@ -23,10 +20,7 @@ The complete solution for Node.js command-line interfaces,
 inspired by Ruby's commander.
 
 %prep
-%setup -q -n package
-%setup -q -T -D -a 1 -n package
-%setup -q -T -D -a 2 -n package
-%patch0 -p1
+%autosetup -n commander.js-%{version} -S git
 
 %build
 
diff --git a/nodejs-commander.yaml b/nodejs-commander.yaml
index 4ce078f..46de69f 100644
--- a/nodejs-commander.yaml
+++ b/nodejs-commander.yaml
@@ -1,4 +1,4 @@
 version_control: github
-src_repo: tj/commander
+src_repo: visionmedia/commander.js
 tag_prefix: "^v"
 seperator: "."
diff --git a/tests-v2.9.0.tar.bz2 b/tests-v2.9.0.tar.bz2
deleted file mode 100644
index 95a925e..0000000
Binary files a/tests-v2.9.0.tar.bz2 and /dev/null differ
diff --git a/v2.9.0.tar.gz b/v2.9.0.tar.gz
new file mode 100644
index 0000000..ab944af
Binary files /dev/null and b/v2.9.0.tar.gz differ