diff --git a/create-tarball.sh b/create-tarball.sh
new file mode 100755
index 0000000..553f8c5
--- /dev/null
+++ b/create-tarball.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e -x
+test $# -eq 1
+test ! -d sisu-guice
+git clone git://github.com/sonatype/sisu-guice.git
+cd ./sisu-guice
+git checkout sisu-guice-${1}
+git branch unbundled-guice-${1}
+git checkout unbundled-guice-${1}
+rm -rf $(ls . | grep -E -v 'core|extensions|pom|COPYING')
+git commit -a -m "Remove unneeded stuff"
+git tag unbundled-${1}
+git archive --format=tar --prefix=google-guice-${1}/ unbundled-${1} \
+    | xz >../google-guice-${1}.tar.xz
diff --git a/google-guice.spec b/google-guice.spec
index b8862a1..2689e08 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -3,16 +3,16 @@
 %endif
 
 %global short_name guice
-%global tag     bd0d620
 
 Name:           google-%{short_name}
 Version:        3.1.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            https://github.com/sonatype/sisu-%{short_name}
-Source:         https://github.com/sonatype/sisu-%{short_name}/tarball/sisu-%{short_name}-%{version}#/%{name}-%{version}.tar.gz
+# ./create-tarball.sh %{version}
+Source:         %{name}-%{version}.tar.xz
 BuildArch:      noarch
 
 BuildRequires:  java-devel
@@ -202,8 +202,7 @@ This package provides %{summary}.
 
 
 %prep
-%setup -q -n sonatype-sisu-%{short_name}-%{tag}
-find -name '*.jar' -delete
+%setup -q
 
 # We don't have struts2 in Fedora yet.
 %pom_disable_module struts2 extensions
@@ -309,6 +308,9 @@ install -p -m 644 extensions/throwingproviders/pom.xml %{buildroot}%{_mavenpomdi
 
 
 %changelog
+* Fri Nov 16 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-7
+- Repackage tarball
+
 * Fri Nov  9 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-6
 - Don't try to build extension modules unless they are needed
 
diff --git a/sources b/sources
index 307b4ea..a699fd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e6dc348d5222abc1ffce7a75f2f187be  google-guice-3.1.2.tar.gz
+f77dccf2a71a4461ce4244e4d7fe7a68  google-guice-3.1.2.tar.xz