diff --git a/.gitignore b/.gitignore
index 23cf756..eb7f628 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 setools-3.3.7.tar.bz2
 setools-3.3.8.tar.bz2
+setools-3.3.8-f1e5b20.tar.bz2
diff --git a/setools.spec b/setools.spec
index f80aaef..4b15b42 100644
--- a/setools.spec
+++ b/setools.spec
@@ -1,5 +1,6 @@
 %global setools_maj_ver 3.3
 %global setools_min_ver 8
+%global gitver f1e5b20
 
 Name: setools
 Version: %{setools_maj_ver}.%{setools_min_ver}
@@ -7,23 +8,25 @@ Release: 8%{?dist}
 License: GPLv2
 URL: http://oss.tresys.com/projects/setools
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{version}/setools-%{version}.tar.bz2
+# Source: http://oss.tresys.com/projects/setools/chrome/site/dists/setools-%{version}/setools-%{version}.tar.bz2
+# git clone https://github.com/TresysTechnology/setools3.git
+# cd setools3
+# gitrev=`git rev-parse --verify --short HEAD`
+# git archive --format=tar --prefix=setools-3.3.8/ HEAD | bzip2 > setools-3.3.8-$gitrev.tar.bz2
+Source: setools-%{version}-%{gitver}.tar.bz2
 Source1: setools.pam
 Source2: apol.desktop
 Source3: seaudit.desktop
 Patch1: 0001-Since-we-do-not-ship-neverallow-rules-all-always-fai.patch
 Patch2: 0002-Fix-sepol-calls-to-work-with-latest-libsepol.patch
-Patch3: 0003-mgrepl-patch-to-Fix-swig-coding-style-for-structures.patch
 Patch4: 0004-Apply-selinux_current_policy_path-patch.patch
 Patch5: 0005-Apply-seaudit-patch-for-progress.c.patch
 Patch6: 0006-Add-support-for-boolean-subs.patch
 Patch7: 0007-Setools-noship.patch
 Patch8: 0008-Add-alias-support-to-seinfo-t.patch
 Patch9: 0009-Fix-help-message-on-sesearch-D.patch
-Patch10: 0010-Apply-swig-patch-to-make-apol-work-again.patch
 Patch11: 0011-Fix-Wformat-security-issues.patch
 Patch12: 0012-Fix-configure.ac-to-use-SWIG-3.0.0.patch
-Patch17: 0017-update-to-libsepool-2.4-parser.patch
 
 Summary: Policy analysis tools for SELinux
 Group: System Environment/Base
@@ -153,17 +156,14 @@ This package includes the following graphical tools:
 %setup -q
 %patch1 -p 1 -b .neverallow
 %patch2 -p 1 -b .libsepol
-%patch3 -p 1 -b .swig
 %patch4 -p 1 -b .current_policy
 %patch5 -p 1 -b .seaudit
 %patch6 -p 1 -b .boolean-subs
 %patch7 -p 1 -b .noship
 %patch8 -p 1 -b .seinfo-t
 %patch9 -p 1 -b .sesearch-D
-%patch10 -p 1 -b .wig-patch
 %patch11 -p 1 -b .Wformat-security
 %patch12 -p 1 -b .version
-%patch17 -p 1 -b .libsepool24
 
 %ifarch sparc sparcv9 sparc64 s390 s390x
     for file in `find . -name Makefile.am`; do
@@ -283,6 +283,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %postun libs-tcl -p /sbin/ldconfig
 
 %changelog
+* Fri Jan 29 2016 Petr Lautrbach <plautrba@redhat.com> 3.3.8-8
+- Rebase to the latest setools3 sources (#1266520)
+
 * Fri Sep 25 2015 David Sommerseth <davids@redhat.com> - 3.3.8-8
 - Add patch for libsepool 2.4 support
 
diff --git a/sources b/sources
index 8bc4061..6b2ffc9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d68d0d4e4da0f01da0f208782ff04b91  setools-3.3.8.tar.bz2
+d262b1d4bacaa8c4890d644a03b5e73d  setools-3.3.8-f1e5b20.tar.bz2