diff --git a/samba.spec b/samba.spec
index 57c72bb..b283e61 100644
--- a/samba.spec
+++ b/samba.spec
@@ -4,7 +4,7 @@
 %define main_release 2
 
 %define samba_version 4.1.0
-%define talloc_version 2.0.7
+%define talloc_version 2.0.8
 %define ntdb_version 0.9
 %define tdb_version 1.2.12
 %define tevent_version 0.9.18
@@ -31,8 +31,6 @@
 %global with_mitkrb5 1
 %global with_dc 0
 
-%global with_swat 0
-
 %if %{with testsuite}
 # The testsuite only works with a full build right now.
 %global with_mitkrb5 0
@@ -70,7 +68,6 @@ Source0:        samba-%{version}%{pre_release}.tar.xz
 # Red Hat specific replacement-files
 Source1: samba.log
 Source2: samba.xinetd
-Source3: swat.desktop
 Source4: smb.conf.default
 Source5: pam_winbind.conf
 Source6: samba.pamd
@@ -204,9 +201,7 @@ Obsoletes: samba4-common < %{samba_depver}
 # This is for upgrading from F17 to F18
 Obsoletes: samba-doc
 Obsoletes: samba-domainjoin-gui
-%if ! %with_swat
 Obsoletes: samba-swat
-%endif
 
 %description common
 samba4-common provides files necessary for both the server and client
@@ -341,25 +336,6 @@ Obsoletes: samba4-pidl < %{samba_depver}
 The samba4-pidl package contains the Perl IDL compiler used by Samba
 and Wireshark to parse IDL and similar protocols
 
-### SWAT
-%if %with_swat
-%package swat
-Summary: The Samba SMB server Web configuration program
-Group: Applications/System
-Requires: %{name} = %{samba_depver}
-Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-libs = %{samba_depver}
-Requires: xinetd
-
-Provides: samba4-swat = %{samba_depver}
-Obsoletes: samba4-swat < %{samba_depver}
-
-%description swat
-The samba-swat package includes the new SWAT (Samba Web Administration
-Tool), for remotely managing Samba's smb.conf file using your favorite
-Web browser.
-%endif
-
 ### TEST
 %package test
 Summary: Testing tools for Samba servers and clients
@@ -557,9 +533,6 @@ install -d -m 0755 %{buildroot}/var/lib/samba/scripts
 install -d -m 0755 %{buildroot}/var/lib/samba/sysvol
 install -d -m 0755 %{buildroot}/var/log/samba/old
 install -d -m 0755 %{buildroot}/var/spool/samba
-%if %with_swat
-install -d -m 0755 %{buildroot}/%{_datadir}/swat/using_samba
-%endif
 install -d -m 0755 %{buildroot}/var/run/samba
 install -d -m 0755 %{buildroot}/var/run/winbindd
 install -d -m 0755 %{buildroot}/%{_libdir}/samba
@@ -581,15 +554,6 @@ install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/samba/smb.conf
 install -d -m 0755 %{buildroot}%{_sysconfdir}/security
 install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/security/pam_winbind.conf
 
-# Install pam file for swat
-%if %with_swat
-install -d -m 0755 %{buildroot}%{_sysconfdir}/pam.d
-install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/samba
-
-install -d -m 0755 %{buildroot}%{_sysconfdir}/xinetd.d
-install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/swat
-%endif
-
 echo 127.0.0.1 localhost > %{buildroot}%{_sysconfdir}/samba/lmhosts
 
 # openLDAP database schema
@@ -827,6 +791,8 @@ rm -rf %{buildroot}
 %{_mandir}/man8/vfs_tsmsm.8*
 %{_mandir}/man8/vfs_xattr_tdb.8*
 
+%exclude %{_mandir}/man8/swat.8*
+
 ### CLIENT
 %files client
 %defattr(-,root,root)
@@ -1375,18 +1341,12 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libwinbind-client.so
 %endif # ! with_libwbclient
 
-%if ! %with_swat
-%exclude %{_datadir}/samba/swat
-%exclude %{_sbindir}/swat
-%exclude %{_mandir}/man8/swat.8*
-%endif
-
 ### LIBSMBCLIENT
 %if %with_libsmbclient
 %files -n libsmbclient
 %defattr(-,root,root)
-%attr(755,root,root) %{_libdir}/libsmbclient.so.*
-%attr(755,root,root) %{_libdir}/libsmbsharemodes.so.*
+%{_libdir}/libsmbclient.so.*
+%{_libdir}/libsmbsharemodes.so.*
 
 ### LIBSMBCLIENT-DEVEL
 %files -n libsmbclient-devel
@@ -1428,17 +1388,6 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{python_sitearch}/*
 
-### SWAT
-%if %with_swat
-%files swat
-%defattr(-,root,root)
-%config(noreplace) %{_sysconfdir}/xinetd.d/swat
-%config(noreplace) %{_sysconfdir}/pam.d/samba
-%{_datadir}/samba/swat
-%{_sbindir}/swat
-%{_mandir}/man8/swat.8*
-%endif
-
 ### TEST
 %files test
 %defattr(-,root,root)