diff --git a/0.24.0.tar.gz b/0.24.0.tar.gz
new file mode 100644
index 0000000..5ae1539
Binary files /dev/null and b/0.24.0.tar.gz differ
diff --git a/commonmark-0.24.0.tgz b/commonmark-0.24.0.tgz
deleted file mode 100644
index 2cbc24e..0000000
Binary files a/commonmark-0.24.0.tgz and /dev/null differ
diff --git a/dl-tests.sh b/dl-tests.sh
deleted file mode 100644
index 2b694f4..0000000
--- a/dl-tests.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-tag=$(sed -n 's/^Version:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-url=$(sed -n 's/^URL:\s\(.*\)$/\1/p' ./*.spec | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-pkgdir=$(basename $url | sed -s 's/\.git$//')
-
-echo "tag: $tag"
-echo "URL: $url"
-echo "pkgdir: $pkgdir"
-
-set -e
-
-tmp=$(mktemp -d)
-
-trap cleanup EXIT
-cleanup() {
-    echo Cleaning up...
-    set +e
-    [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp"
-}
-
-unset CDPATH
-pwd=$(pwd)
-
-pushd "$tmp"
-git clone $url
-cd $pkgdir
-echo Finding git tag
-gittag=$(git show-ref --tags | cut -d' ' -f2 | grep "${tag}$" || git show-ref --tags | cut -d' ' -f2 | sort -Vr | head -n1)
-if [ -z $gittag ]; then
-	gittag=tags/$tag
-fi
-echo "Git Tag: $gittag"
-if [ -d "test" ]; then
-  git archive --prefix='test/' --format=tar ${gittag}:test/ \
-      | bzip2 > "$pwd"/tests-${tag}.tar.bz2
-elif [ -d "tests" ]; then
-  git archive --prefix='tests/' --format=tar ${gittag}:tests/ \
-      | bzip2 > "$pwd"/tests-${tag}.tar.bz2
-elif [ -d "spec" ]; then
-  git archive --prefix='spec/' --format=tar ${gittag}:spec/ \
-      | bzip2 > "$pwd"/tests-${tag}.tar.bz2
-else
-  echo "No test directory found for tag ${gittag}"
-fi
-if [ -d "support" ]; then
-  git archive --prefix='support/' --format=tar ${gittag}:support/ \
-      | bzip2 > "$pwd"/support-${tag}.tar.bz2
-fi
-if [ -d "fixture" ]; then
-  git archive --prefix='fixture/' --format=tar ${gittag}:fixture/ \
-      | bzip2 > "$pwd"/fixture-${tag}.tar.bz2
-fi
-if [ -d "examples" ]; then
-  git archive --prefix='examples/' --format=tar ${gittag}:examples/ \
-      | bzip2 > "$pwd"/examples-${tag}.tar.bz2
-elif [ -d "example" ]; then
-  git archive --prefix='example/' --format=tar ${gittag}:example/ \
-      | bzip2 > "$pwd"/examples-${tag}.tar.bz2
-fi
-if [ -d "tasks" ]; then
-  git archive --prefix='tasks/' --format=tar ${gittag}:tasks/ \
-      | bzip2 > "$pwd"/tasks-${tag}.tar.bz2
-fi
-if [ -d "docs" ]; then
-  git archive --prefix='docs/' --format=tar ${gittag}:docs/ \
-      | bzip2 > "$pwd"/docs-${tag}.tar.bz2
-elif [ -d "doc" ]; then
-  git archive --prefix='doc/' --format=tar ${gittag}:doc/ \
-      | bzip2 > "$pwd"/docs-${tag}.tar.bz2
-fi
-if [ -d "src" ]; then
-  git archive --prefix='src/' --format=tar ${gittag}:src/ \
-      | bzip2 > "$pwd"/src-${tag}.tar.bz2
-fi
-if [ -d "tools" ]; then
-  git archive --prefix='tools/' --format=tar ${gittag}:tools/ \
-      | bzip2 > "$pwd"/tools-${tag}.tar.bz2
-fi
-popd
diff --git a/nodejs-commonmark.spec b/nodejs-commonmark.spec
index 5c29755..cbb891b 100644
--- a/nodejs-commonmark.spec
+++ b/nodejs-commonmark.spec
@@ -6,14 +6,8 @@ Version:	0.24.0
 Release:	1
 Summary:	A strongly specified, highly compatible variant of Markdown
 License:	BSD and MIT and Creative Commons
-URL:		https://github.com/jgm/commonmark.js.git
-Source0:	https://registry.npmjs.org/commonmark/-/commonmark-%{version}.tgz
-# The test files are not included in the npm tarball.
-# Source{1,2} is generated by running Source10, which pulls from the upstream
-# version control repository.
-Source1:	tests-%{version}.tar.bz2
-Source2:	tools-%{version}.tar.bz2
-Source10:	dl-tests.sh
+URL:		https://github.com/jgm/commonmark.js
+Source0:	https://github.com/jgm/commonmark.js/archive/%{version}.tar.gz
 BuildArch:	noarch
 ExclusiveArch:       %{nodejs_arches} noarch
 BuildRequires:       	nodejs-packaging
@@ -26,9 +20,7 @@ Requires:            	nodejs
 A strongly specified, highly compatible variant of Markdown
 
 %prep
-%setup -q -n package
-%setup -q -T -D -a 1 -n package
-%setup -q -T -D -a 2 -n package
+%autosetup -n commonmark.js-%{version}
 chmod -x ./lib/index.js
 
 %build
diff --git a/tests-0.24.0.tar.bz2 b/tests-0.24.0.tar.bz2
deleted file mode 100644
index 50f8656..0000000
Binary files a/tests-0.24.0.tar.bz2 and /dev/null differ
diff --git a/tools-0.24.0.tar.bz2 b/tools-0.24.0.tar.bz2
deleted file mode 100644
index e31af49..0000000
Binary files a/tools-0.24.0.tar.bz2 and /dev/null differ