diff --git a/asciidoc.spec b/asciidoc.spec
index deb35fa..823e52d 100644
--- a/asciidoc.spec
+++ b/asciidoc.spec
@@ -5,18 +5,13 @@
 Summary: Text based document generation
 Name: asciidoc
 Version: 8.6.10
-Release: 0.2.20180605git%{shortcommit}%{?dist}
+Release: 0.3.20180605git%{shortcommit}%{?dist}
 # The python code does not specify a version.
 # The javascript example code is GPLv2+.
 License: GPL+ and GPLv2+
 
 URL: http://asciidoc.org
-# Tarball name has to be modified, due github repo 
-# is called asciidoc-py3 instead of asciidoc
-# This solution is temporary, due upstream 
-# haven't released 8.6.10 version yet.
-# https://github.com/%%{name}/%%{name}-py3/archive/%%{version}.tar.gz
-Source0: %{name}-%{version}.tar.gz
+Source0: https://github.com/%{name}/%{name}-py3/archive/%{commit}/%{name}-py3-%{shortcommit}.tar.gz
 
 Patch1: asciidoc-python3.patch
 
@@ -75,7 +70,7 @@ Requires: lilypond
 
 
 %prep
-%autosetup -p1
+%autosetup -n %{name}-py3-%{commit} -p1
 
 # Fix line endings on COPYRIGHT file
 sed -i "s/\r//g" COPYRIGHT
@@ -174,6 +169,9 @@ cd tests
 %{_sysconfdir}/asciidoc/filters/music/*.py
 
 %changelog
+* Wed Jun 13 2018 Todd Zullinger <tmz@pobox.com> - 8.6.10-0.3.20180605git986f99d
+- Use upstream tarball
+
 * Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 8.6.10-0.2.20180605git986f99d
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index 56df5aa..b78aff6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (asciidoc-8.6.10.tar.gz) = f195d9cf2a66a67b038c6ddb3207573ec3f4e3baa1b107a56f5dd26580c8d7f1fc92c20011a0193ff0781b4b04e7e22b1f7991c4b0046e47acc634c3d2cd3b98
+SHA512 (asciidoc-py3-986f99d.tar.gz) = 758362cac485cbe4fd504224f7a8d24d20955464dd56af258e9a70deac8dc89d0f07f8e4567cfbbd3e1cbe6336704e9d12590bade662dd5bf228ea7e611676d1