diff --git a/1.71.tar.gz b/1.71.tar.gz
new file mode 100644
index 0000000..6422de9
--- /dev/null
+++ b/1.71.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d729430c80daf3803dffd9b6bec61a3b371015ba70d3eda60121baf2613b3b8
+size 4406613
diff --git a/beust-jcommander-1.71.tar.gz b/beust-jcommander-1.71.tar.gz
deleted file mode 100644
index 729092c..0000000
--- a/beust-jcommander-1.71.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d084ad6b8087f2a215ee53a611a25e2d25903f400f36b92099be59cece7c481
-size 122566
diff --git a/beust-jcommander.spec b/beust-jcommander.spec
index 9d722d1..7e76af7 100644
--- a/beust-jcommander.spec
+++ b/beust-jcommander.spec
@@ -24,19 +24,15 @@ Summary:        Java framework for parsing command line parameters
 License:        Apache-2.0
 Group:          Development/Libraries/Java
 URL:            http://jcommander.org/
-# ./generate-tarball.sh
-Source0:        %{name}-%{version}.tar.gz
+Source0:        https://github.com/cbeust/%{short_name}/archive/%{version}.tar.gz
 # Adapted from earlier version that still shipped poms. It uses kobalt for building now
 Source1:        %{name}.pom
 Source2:        %{name}-build.xml
-# Cleaned up bundled jars hose licensing cannot be easily verified
-Source3:        generate-tarball.sh
 Patch0:         0001-ParseValues-NullPointerException-patch.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
 Requires:       java >= 1.8
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       %{short_name} = %{version}-%{release}
@@ -55,6 +51,7 @@ This package contains the %{summary}.
 
 %prep
 %setup -q -n %{short_name}-%{version}
+rm -rf gradle* kobalt* lib
 %patch0 -p1
 
 chmod -x license.txt
diff --git a/generate-tarball.sh b/generate-tarball.sh
deleted file mode 100644
index ec52ecd..0000000
--- a/generate-tarball.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-name=beust-jcommander
-version="$(sed -n 's/Version:\s*//p' *.spec)"
-
-# RETRIEVE
-wget "https://github.com/cbeust/jcommander/archive/${version}.tar.gz" -O "${name}-${version}.orig.tar.gz"
-
-rm -rf tarball-tmp
-mkdir tarball-tmp
-cd tarball-tmp
-tar zxf "../${name}-${version}.orig.tar.gz"
-
-# CLEAN TARBALL
-rm -r */gradle* */kobalt* */lib
-
-tar zcf "../${name}-${version}.tar.gz" *
-cd ..
-rm -r tarball-tmp "${name}-${version}.orig.tar.gz"