diff --git a/2.1.11.tar.gz b/2.1.11.tar.gz
new file mode 100644
index 0000000..d80e8ba
Binary files /dev/null and b/2.1.11.tar.gz differ
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index c60c681..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,58 +0,0 @@
-RequireJS r.js is released under two licenses: new BSD, and MIT. You may pick the
-license that best suits your development needs. The text of both licenses are
-provided below.
-
-
-The "New" BSD License:
-----------------------
-
-Copyright (c) 2010-2011, The Dojo Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-  * Neither the name of the Dojo Foundation nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-MIT License
------------
-
-Copyright (c) 2010-2011, The Dojo Foundation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/build-2.1.11.tar.bz2 b/build-2.1.11.tar.bz2
deleted file mode 100644
index 3b41425..0000000
Binary files a/build-2.1.11.tar.bz2 and /dev/null differ
diff --git a/nodejs-requirejs.spec b/nodejs-requirejs.spec
index d36d3f6..5fe790e 100644
--- a/nodejs-requirejs.spec
+++ b/nodejs-requirejs.spec
@@ -8,22 +8,9 @@ Release:             1
 Summary:             Node.js adapter for RequireJS, for loading AMD modules
 License:             MIT or BSD
 URL:                 https://github.com/jrburke/r.js
-Source0:             http://registry.npmjs.org/requirejs/-/requirejs-%{version}.tgz
-#git clone git://github.com/jrburke/r.js.git
-#cd r.js
-#git archive --prefix="tests/" --format=tar tags/${tag}:tests/ \
-#    | bzip2 > "$pwd"/tests-${tag}.tar.bz2
-#git archive --prefix="build/" --format=tar tags/${tag}:build/ \
-#    | bzip2 > "$pwd"/build-${tag}.tar.bz2
-Source1:             tests-%{version}.tar.bz2
-Source2:             build-%{version}.tar.bz2
-# License is included in upstream version control repository:
-# https://github.com/jrburke/r.js/commits/master/LICENSE
-Source20:            LICENSE
-
+Source0:             https://github.com/jrburke/r.js/archive/%{version}.tar.gz
 BuildArch:           noarch
 ExclusiveArch:       %{nodejs_arches} noarch
-
 BuildRequires:       nodejs-packaging
 
 %description
@@ -34,10 +21,7 @@ improve the speed and quality of your code.
 
 
 %prep
-%setup -q -n package
-%setup -q -T -D -a 1 -n package
-%setup -q -T -D -a 2 -n package
-cp -p %{SOURCE20} .
+%autosetup -n r.js-%{version}
 
 
 %build
@@ -49,7 +33,7 @@ mkdir -p %{buildroot}%{nodejs_sitelib}/requirejs
 cp -pr package.json require.js \
     %{buildroot}%{nodejs_sitelib}/requirejs
 mkdir -p %{buildroot}%{nodejs_sitelib}/requirejs/bin
-install -p -D -m0755 bin/r.js \
+install -p -D -m0755 dist/r.js \
     %{buildroot}%{nodejs_sitelib}/requirejs/bin/r.js
 
 mkdir -p %{buildroot}%{_bindir}
@@ -62,7 +46,7 @@ ln -s %{nodejs_sitelib}/requirejs/bin/r.js \
 %if 0%{?enable_tests}
 %check
 pushd tests/
-%__nodejs ../bin/r.js all.js
+%__nodejs ../dist/r.js all.js
 popd
 %endif
 
diff --git a/requirejs-2.1.11.tgz b/requirejs-2.1.11.tgz
deleted file mode 100644
index 03df19e..0000000
Binary files a/requirejs-2.1.11.tgz and /dev/null differ
diff --git a/tests-2.1.11.tar.bz2 b/tests-2.1.11.tar.bz2
deleted file mode 100644
index b55c6ca..0000000
Binary files a/tests-2.1.11.tar.bz2 and /dev/null differ