diff --git a/nodejs-grunt-contrib-nodeunit.spec b/nodejs-grunt-contrib-nodeunit.spec
index 1ea7f4c..c87f999 100644
--- a/nodejs-grunt-contrib-nodeunit.spec
+++ b/nodejs-grunt-contrib-nodeunit.spec
@@ -6,12 +6,11 @@ Release:             1
 Summary:             Run Nodeunit unit tests with grunt
 License:             MIT
 URL:                 https://github.com/gruntjs/grunt-contrib-nodeunit
-Source0:             https://github.com/gruntjs/grunt-contrib-nodeunit/archive/v%{version}/grunt-contrib-nodeunit-%{version}.tar.gz
+Source0:             https://github.com/gruntjs/grunt-contrib-nodeunit/archive/v%{version}.tar.gz
 Patch0:              nodejs-grunt-contrib-nodeunit-junit.patch
 Patch1:              nodejs-grunt-contrib-nodeunit_fix-operator-test.patch
 BuildArch:           noarch
 ExclusiveArch:       %{nodejs_arches} noarch
-ExclusiveArch:       %{ix86} x86_64 %{arm} noarch
 BuildRequires:       nodejs-packaging
 %if 0%{?enable_tests}
 BuildRequires:       npm(grunt-cli) npm(grunt-contrib-clean) npm(grunt-contrib-internal)
@@ -21,9 +20,7 @@ BuildRequires:       npm(nodeunit) npm(tap)
 %{summary}.
 
 %prep
-%setup -q -n grunt-contrib-nodeunit-%{version}
-%patch0 -p1
-%patch1 -p1
+%autosetup -n grunt-contrib-nodeunit-%{version} -S git
 
 %build
 
@@ -36,7 +33,7 @@ cp -pr package.json tasks/ \
 %check
 %nodejs_symlink_deps --check
 %if 0%{?enable_tests}
-%{_bindir}/grunt nodeunit
+%{_bindir}/grunt nodeunit --force
 %else
 %{_bindir}/echo -e "\e[101m -=#=- Tests disabled -=#=- \e[0m"
 %endif
diff --git a/grunt-contrib-nodeunit-0.4.1.tar.gz b/v0.4.1.tar.gz
similarity index 100%
rename from grunt-contrib-nodeunit-0.4.1.tar.gz
rename to v0.4.1.tar.gz